feat(web): simplify contextual parsing

* More relaxted parsing in the browser for stable variable/node
  identifier classification.
* String support in the browser.
* contains, refers, and opposite keywords are no longer contextual,
  which simplifies parsing in the browser.

2 files changed, 26 insertions, 12 deletions

diff --git a/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
index 79eb79a7..58620d6a 100644
--- a/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
+++ b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
@@ -3,35 +3,39 @@ module tools.refinery.language.GenerateProblem
 import org.eclipse.xtext.xtext.generator.*
 import org.eclipse.xtext.xtext.generator.model.project.*
 
-var rootPath = ".."
+var rootPath = '..'
 
 Workflow {
         component = XtextGenerator {
                 configuration = {
                         project = StandardProjectConfig {
-                                baseName = "language"
+                                baseName = 'language'
                                 rootPath = rootPath
                                 runtimeTest = {
                                         enabled = true
                                         srcGen = 'src/testFixtures/xtext-gen'
                                 }
                                 genericIde = {
-                                        name = "language-ide"
+                                        name = 'language-ide'
+                                }
+                                web = {
+                                        enabled = true
+                                        name = 'language-web'
                                 }
                                 mavenLayout = true
                         }
                         code = {
-                                encoding = "UTF-8"
-                                lineDelimiter = "\n"
-                                fileHeader = "/*\n * generated by Xtext \${version}\n */"
+                                encoding = 'UTF-8'
+                                lineDelimiter = '\n'
+                                fileHeader = '/*\n * generated by Xtext \${version}\n */'
                                 preferXtendStubs = false
                         }
                 }
 
                 language = StandardLanguage {
-                        name = "tools.refinery.language.Problem"
-                        fileExtensions = "problem"
-                        referencedResource = "platform:/resource/refinery-language-model/model/problem.genmodel"
+                        name = 'tools.refinery.language.Problem'
+                        fileExtensions = 'problem'
+                        referencedResource = 'platform:/resource/refinery-language-model/model/problem.genmodel'
                         serializer = {
                                 generateStub = false
                         }
@@ -44,7 +48,17 @@ Workflow {
                         junitSupport = {
                                 generateStub = false
                                 skipXbaseTestingPackage = true
-                                junitVersion = "5"
+                                junitVersion = '5'
+                        }
+                        webSupport = {
+                                // We only generate the {@code AbstractProblemWebModule},
+                                // because we write our own integration code for CodeMirror 6. 
+                                framework = 'codemirror'
+                                generateHtmlExample = false
+                                generateJettyLauncher = false
+                                generateJsHighlighting = false
+                                generateServlet = false
+                                generateWebXml = false
                         }
                 }
         }
diff --git a/language/src/main/java/tools/refinery/language/Problem.xtext b/language/src/main/java/tools/refinery/language/Problem.xtext
index c4c890e3..6f6a8588 100644
--- a/language/src/main/java/tools/refinery/language/Problem.xtext
+++ b/language/src/main/java/tools/refinery/language/Problem.xtext
@@ -26,7 +26,7 @@ EnumLiteral returns Node:
         name=Identifier;
 
 ReferenceDeclaration:
-        (-> (containment?="contains" | "refers"))?
+        (containment?="contains" | "refers")?
         referenceType=[Relation|QualifiedName]
         ("[" multiplicity=Multiplicity "]")?
         name=Identifier
@@ -184,7 +184,7 @@ QualifiedName hidden():
 
 Identifier:
         ID | "true" | "false" | "unknown" | "error" | "class" | "abstract" | "extends" | "enum" | "pred" | "scope" |
-        "unique" | "default" | "problem" | "contains" | "refers" | "new" | "delete";
+        "unique" | "default" | "problem" | "new" | "delete";
 
 Integer returns ecore::EInt hidden():
         "-"? INT;