Merge pull request #10 from kris7t/cm6-fixes

More CodeMirrror fixes

1 files changed, 9 insertions, 5 deletions

diff --git a/language-web/src/main/js/language/problem.grammar b/language-web/src/main/js/language/problem.grammar
index c242a4ba..8e39243f 100644
--- a/language-web/src/main/js/language/problem.grammar
+++ b/language-web/src/main/js/language/problem.grammar
@@ -1,3 +1,7 @@
+@detectDelim
+
+@external prop implicitCompletion from '../../../../src/main/js/language/props.ts'
+
 @top Problem { statement* }
 
 statement {
@@ -24,7 +28,7 @@ statement {
     RuleBody { ":" sep<OrOp, Conjunction> "~>" sep<OrOp, Action> "." }
   } |
   Assertion {
-    ckw<"default">? (NotOp | UnknownOp)? RelationName
+    kw<"default">? (NotOp | UnknownOp)? RelationName
     ParameterList<AssertionArgument> (":" LogicValue)? "."
   } |
   NodeValueAssertion {
@@ -34,7 +38,7 @@ statement {
     ckw<"unique"> sep<",", UniqueNodeName> "."
   } |
   ScopeDeclaration {
-    ckw<"scope"> sep<",", ScopeElement> "."
+    kw<"scope"> sep<",", ScopeElement> "."
   }
 }
 
@@ -89,11 +93,11 @@ VariableName { QualifiedName }
 
 NodeName { QualifiedName }
 
-QualifiedName { identifier ("::" identifier)* }
+QualifiedName[implicitCompletion=true] { identifier ("::" identifier)* }
 
-kw<term> { @specialize[@name={term}]<identifier, term> }
+kw<term> { @specialize[@name={term},implicitCompletion=true]<identifier, term> }
 
-ckw<term> { @extend[@name={term}]<identifier, term> }
+ckw<term> { @extend[@name={term},implicitCompletion=true]<identifier, term> }
 
 ParameterList<content> { "(" sep<",", content> ")" }