aboutsummaryrefslogtreecommitdiffstats
path: root/integration
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-02-25 10:23:30 +0100
committerJon Bratseth <bratseth@gmail.com>2022-02-25 10:23:30 +0100
commitfc1fd0e6d2e2f651d680ee148dc0f5a8d1bddd45 (patch)
tree94fc6383b8812a85b8f2cfa47c87a3e81c6ae835 /integration
parentb3fe47f779805ee472d8f110af54f16e8a0caa76 (diff)
Allow strict: true | false
Diffstat (limited to 'integration')
-rw-r--r--integration/intellij/build.gradle2
-rw-r--r--integration/intellij/pom.xml2
-rw-r--r--integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf3
3 files changed, 4 insertions, 3 deletions
diff --git a/integration/intellij/build.gradle b/integration/intellij/build.gradle
index dd8a8e0a21c..c85429d4d94 100644
--- a/integration/intellij/build.gradle
+++ b/integration/intellij/build.gradle
@@ -36,7 +36,7 @@ compileJava {
}
group 'ai.vespa'
-version '1.1.2' // Also update pom.xml version if this is changed
+version '1.1.3' // Also update pom.xml version if this is changed
sourceCompatibility = 11
diff --git a/integration/intellij/pom.xml b/integration/intellij/pom.xml
index 9982441c449..cb0df927ff9 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.2</version> <!-- See copy-zip below, which depends on this being the same as the v. in build.gradle -->
+ <version>1.1.3</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 8fc0aede912..6a5b59984e4 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
@@ -163,7 +163,7 @@ private RankProfileBodyOptions ::= MatchPhaseDefinition | NumThreadsDefinition |
ignore-default-rank-features | RankPropertiesDefinition | FirstPhaseDefinition |
SummaryFeaturesDefinition | MatchFeaturesDefinition | RankFeaturesDefinition |
SecondPhaseDefinition | ConstantsDefinition | RankDefinition | RankTypeDefinition |
- MinHitsDefinition | NumSearchPartitionDefinition | FieldWeightDefinition
+ MinHitsDefinition | NumSearchPartitionDefinition | FieldWeightDefinition | StrictDefinition
MatchPhaseDefinition ::= match-phase '{' MatchPhaseBody '}'
MatchPhaseBody ::= MatchPhaseBodyOptions+
@@ -180,6 +180,7 @@ private TermwiseLimitDefinition ::= termwise-limit ':' ('-')? (FLOAT_REG | INTEG
private MinHitsDefinition ::= min-hits-per-thread ':' ('-')? INTEGER_REG
private NumSearchPartitionDefinition ::= num-search-partition ':' INTEGER_REG
FieldWeightDefinition ::= weight DottedIdentifiers ':' INTEGER_REG
+StrictDefinition ::= strict ':' (true | false)
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