Support rank-profile inputs

4 files changed, 9 insertions, 4 deletions

diff --git a/integration/intellij/build.gradle b/integration/intellij/build.gradle
index c85429d4d94..6c874269c5d 100644
--- a/integration/intellij/build.gradle
+++ b/integration/intellij/build.gradle
@@ -36,7 +36,7 @@ compileJava {
 }
 
 group 'ai.vespa'
-version '1.1.3' // Also update pom.xml version if this is changed
+version '1.1.4' // Also update pom.xml version if this is changed
 
 sourceCompatibility = 11
 
@@ -64,7 +64,7 @@ patchPluginXml {
   untilBuild = '213.*'
   // in changeNotes you can add a description of the changes in this version (would appear in the plugin page in preferences\plugins)
     changeNotes = """
-      <em>Full support for .profile files. Support finding usages and go to definition across files.</em>"""
+      <em>Support for inputs in rank profiles.</em>"""
 }
 
 test {
diff --git a/integration/intellij/pom.xml b/integration/intellij/pom.xml
index cb0df927ff9..07488ed3d93 100644
--- a/integration/intellij/pom.xml
+++ b/integration/intellij/pom.xml
@@ -9,7 +9,7 @@
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <artifactId>vespa-intellij</artifactId> <!-- Not used - plugin is build by gradle -->
-    <version>1.1.3</version> <!-- See copy-zip below, which depends on this being the same as the v. in build.gradle -->
+    <version>1.1.4</version> <!-- See copy-zip below, which depends on this being the same as the v. in build.gradle -->
     <description>
         Maven wrapper for the gradle build of this IntelliJ plugin.
     </description>
diff --git a/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf b/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf
index 8bec7d1bbd8..e945ed4fe0d 100644
--- a/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf
+++ b/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf
@@ -165,7 +165,8 @@ private RankProfileBodyOptions ::= MatchPhaseDefinition | NumThreadsDefinition |
                            ignore-default-rank-features | RankPropertiesDefinition | FirstPhaseDefinition | 
                            SummaryFeaturesDefinition | MatchFeaturesDefinition | RankFeaturesDefinition | 
                            SecondPhaseDefinition | ConstantsDefinition | RankDefinition | RankTypeDefinition | 
-                           MinHitsDefinition | NumSearchPartitionDefinition | FieldWeightDefinition | StrictDefinition
+                           MinHitsDefinition | NumSearchPartitionDefinition | FieldWeightDefinition | StrictDefinition |
+                           InputsDefinition
 
 MatchPhaseDefinition ::= match-phase '{' MatchPhaseBody '}'
 MatchPhaseBody ::= MatchPhaseBodyOptions+
@@ -183,6 +184,9 @@ private MinHitsDefinition ::= min-hits-per-thread ':' ('-')? INTEGER_REG
 private NumSearchPartitionDefinition ::= num-search-partition ':' INTEGER_REG
 FieldWeightDefinition ::= weight DottedIdentifiers ':' INTEGER_REG
 StrictDefinition ::= strict ':' (true | false)
+InputsDefinition ::= inputs '{' InputsBody '}'
+InputsBody ::= (QueryDefinition ':' TensorType)*
+
 FirstPhaseDefinition ::= first-phase '{' FirstPhaseBody '}'  { mixin="ai.vespa.intellij.schema.psi.impl.SdFirstPhaseDefinitionMixin" }
 FirstPhaseBody ::= FirstPhaseBodyOptions* // Does not support zero-or-one occurrences
 private FirstPhaseBodyOptions ::= (keep-rank-count ':' INTEGER_REG) | (rank-score-drop-limit ':' ('-')? (FLOAT_REG | INTEGER_REG)) | ExpressionDefinition
diff --git a/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex b/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex
index eaaab813202..3947a9fb2eb 100644
--- a/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex
+++ b/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex
@@ -146,6 +146,7 @@ WORD = \w+
   "loose"                    { return LOOSE; }
   "strict"                   { return STRICT; }
   "rank-properties"          { return RANK_PROPERTIES; }
+  "inputs"                   { return INPUTS; }
   
   "first-phase"              { return FIRST_PHASE; }
   "keep-rank-count"          { return KEEP_RANK_COUNT; }