chore(web): remove CodeMirror 5 MWE2 integration

CodeMirror 6 uses a hand-writter Lezer parser instead of the stream
parser generated by Xtext for CodeMirror 5.

8 files changed, 16 insertions, 100 deletions

diff --git a/language-mwe2/build.gradle b/language-mwe2/build.gradle
deleted file mode 100644
index 4b9017c5..00000000
--- a/language-mwe2/build.gradle
+++ /dev/null
@@ -1,6 +0,0 @@
-apply plugin: 'java-library'
-apply from: "${rootDir}/gradle/java-common.gradle"
-
-dependencies {
-        api "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
-}
diff --git a/language-mwe2/src/main/java/tools/refinery/language/mwe2/ProblemWebIntegrationFragment.java b/language-mwe2/src/main/java/tools/refinery/language/mwe2/ProblemWebIntegrationFragment.java
deleted file mode 100644
index cdebe452..00000000
--- a/language-mwe2/src/main/java/tools/refinery/language/mwe2/ProblemWebIntegrationFragment.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package tools.refinery.language.mwe2;
-
-import java.util.Set;
-
-import org.eclipse.xtext.xtext.generator.web.WebIntegrationFragment;
-
-import com.google.common.collect.Multimap;
-
-public class ProblemWebIntegrationFragment extends WebIntegrationFragment {
-        private static final String START_STATE = "start";
-        private static final String PREDICATE_BODY_STATE = "predicateBody";
-        private static final String CM_MODE_META = "meta";
-
-        public ProblemWebIntegrationFragment() {
-                setFramework(Framework.CODEMIRROR.name());
-                // Use the CodeMirror default .cm-number instead of .cm-constant.cm-numeric
-                addSuppressPattern("number_decimal");
-                // We use our own custom single-line comments
-                addSuppressPattern("comment_singleLine");
-                // Override bracket indentation behavior
-                addSuppressPattern("bracket_open");
-                addSuppressPattern("parenthesis_open");
-                addSuppressPattern("brace_open");
-                addSuppressPattern("bracket_close");
-                addSuppressPattern("parenthesis_close");
-                addSuppressPattern("brace_close");
-        }
-
-        @Override
-        public void setFramework(String frameworkName) {
-                if (!frameworkName.toUpperCase().equals(Framework.CODEMIRROR.name())) {
-                        throw new IllegalStateException("Framework cannot be changed from CodeMirror");
-                }
-                super.setFramework(frameworkName);
-        }
-
-        @Override
-        protected Multimap<String, String> createCodeMirrorPatterns(String langId, Set<String> keywords) {
-                Multimap<String, String> patterns = super.createCodeMirrorPatterns(langId, keywords);
-                // Use the CodeMirror default .cm-number instead of .cm-constant.cm-numeric
-                patterns.put(START_STATE,
-                                "{token: \"number\", regex: \"[+-]?\\\\d+(?:(?:\\\\.\\\\d*)?(?:[eE][+-]?\\\\d+)?)?\\\\b\"}");
-                // We use our own custom single-line comments
-                patterns.put(START_STATE, "{token: \"comment\", regex: \"%.*$\"}");
-                patterns.put(START_STATE, "{token: \"comment\", regex: \"\\\\/\\\\/.*$\"}");
-                patterns.put(CM_MODE_META, "lineComment: \"%\"");
-                // Override indentation behavior
-                patterns.put(START_STATE, "{token: \"lparen\", indent: true, regex: \"[[({]\"}");
-                patterns.put(START_STATE, "{token: \"rparen\", dedent: true, regex: \"[\\\\])}]\"}");
-                patterns.putAll(PREDICATE_BODY_STATE, patterns.get(START_STATE));
-                patterns.put(START_STATE, "{indent: true, push: \"" + PREDICATE_BODY_STATE + "\", regex: \"<->\"}");
-                patterns.put(PREDICATE_BODY_STATE,
-                                "{dedent: true, dedentIfLineStart: false, pop: true, regex: \"\\\\.\\\\s*$\"}");
-                patterns.put(PREDICATE_BODY_STATE, "{indent: true, dedent: true, regex: \"[;]\"}");
-                // We must repeat the keyword rule here, because Xtext only adds it to "main"
-                // later
-                patterns.put(PREDICATE_BODY_STATE, "{token: \"keyword\", regex: \"\\\\b(?:\" + keywords + \")\\\\b\"}");
-                patterns.put(CM_MODE_META, "electricChars: \"])];\"");
-                return patterns;
-        }
-}
diff --git a/language-web/build.gradle b/language-web/build.gradle
index 1f1457d6..f2b9b43f 100644
--- a/language-web/build.gradle
+++ b/language-web/build.gradle
@@ -51,12 +51,12 @@ def generateLezerGrammar = tasks.register('generateLezerGrammar', RunNpmYarn) {
 
 def assembleFrontend = tasks.named('assembleFrontend')
 assembleFrontend.configure {
-        dependsOn generateXtextLanguage
         dependsOn generateLezerGrammar
         inputs.dir 'src/main/css'
         inputs.dir 'src/main/html'
         inputs.dir 'src/main/js'
-        inputs.dir "${buildDir}/generated/sources/xtext/js"
+        inputs.file "${buildDir}/generated/sources/lezer/problem.ts"
+        inputs.file "${buildDir}/generated/sources/lezer/problem.terms.ts"
         inputs.files('package.json', 'yarn.lock', 'webpack.config.js')
         outputs.dir productionResources
 }
@@ -135,7 +135,7 @@ def jettyRun = tasks.register('jettyRun', JavaExec) {
 
 tasks.register('webpackServe', RunNpmYarn) {
         dependsOn installFrontend
-        dependsOn generateXtextLanguage
+        dependsOn generateLezerGrammar
         outputs.dir "${webpackOutputDir}/development"
         script = 'run serve'
         group = 'run'
diff --git a/language-web/src/main/js/editor/problem.grammar b/language-web/src/main/js/editor/problem.grammar
index c64402b0..921cec53 100644
--- a/language-web/src/main/js/editor/problem.grammar
+++ b/language-web/src/main/js/editor/problem.grammar
@@ -3,41 +3,42 @@
 
 statement {
   ProblemDeclaration {
-    kw<"problem"> QualifiedName "."
+    ckw<"problem"> QualifiedName "."
   } |
   ClassDefinition {
-    kw<"abstract">? kw<"class"> RelationName
+    ckw<"abstract">? ckw<"class"> RelationName
     (ClassBody {  "{" ReferenceDeclaration* "}" } | ".")
   } |
   EnumDefinition {
-    kw<"enum"> RelationName
+    ckw<"enum"> RelationName
     (EnumBody { "{" sep<",", UniqueNodeName> "}" } | ".")
   } |
   PredicateDefinition {
-    (kw<"error"> kw<"pred">? | kw<"pred">) RelationName ParameterList<Parameter>?
+    (ckw<"error"> ckw<"pred">? | ckw<"pred">) RelationName ParameterList<Parameter>?
     PredicateBody { ("<->" sep<OrOp, Conjunction>)?  "." }
   } |
   Assertion {
-    kw<"default">? (NotOp | UnknownOp)? RelationName
+    ckw<"default">? (NotOp | UnknownOp)? RelationName
     ParameterList<AssertionArgument> (":" LogicValue)? "."
   } |
   UniqueDeclaration {
-    kw<"unique"> sep<",", UniqueNodeName> "."
+    ckw<"unique"> sep<",", UniqueNodeName> "."
   } |
   ScopeDeclaration {
-    kw<"scope"> sep<",", ScopeElement> "."
+    ckw<"scope"> sep<",", ScopeElement> "."
   }
 }
 
 ReferenceDeclaration {
-  (kw<"refers"> | kw<"contains">)?
-  RelationName
+  ((kw<"refers"> | kw<"contains">) !times RelationName | !plus RelationName)
   RelationName
   ( "[" Multiplicity? "]" )?
   (kw<"opposite"> RelationName)?
   ";"?
 }
 
+@precedence { times @left, plus }
+
 Parameter { RelationName? VariableName }
 
 Conjunction { sep1<",", Literal> }
@@ -53,7 +54,7 @@ Argument { VariableName | Real }
 AssertionArgument { NodeName | StarArgument | Real }
 
 LogicValue {
-  kw<"true"> | kw<"false"> | kw<"unknown"> | kw<"error">
+  ckw<"true"> | ckw<"false"> | ckw<"unknown"> | ckw<"error">
 }
 
 ScopeElement { RelationName ("=" | "+=") Multiplicity }
@@ -72,6 +73,8 @@ QualifiedName { identifier ("::" identifier)* }
 
 kw<term> { @specialize[@name={term}]<identifier, term> }
 
+ckw<term> { @extend[@name={term}]<identifier, term> }
+
 ParameterList<content> { "(" sep<",", content> ")" }
 
 sep<separator, content> { sep1<separator, content>? }
diff --git a/language-web/webpack.config.js b/language-web/webpack.config.js
index c51d55d6..55b590ca 100644
--- a/language-web/webpack.config.js
+++ b/language-web/webpack.config.js
@@ -25,7 +25,6 @@ const publicHost = process.env['PUBLIC_HOST'] || listenHost;
 const publicPort = portNumberOrElse('PUBLIC_PORT', listenPort);
 
 const resolveSources = sources => path.resolve(__dirname, 'src', sources);
-const resolveGenerated = sources => path.resolve(__dirname, 'build/generated/sources', sources);
 const mainJsSources = resolveSources('main/js');
 const babelLoaderFilters = {
   include: [mainJsSources],
@@ -150,7 +149,6 @@ module.exports = {
     modules: [
       'node_modules',
       mainJsSources,
-      resolveGenerated('xtext/js'),
     ],
     extensions: ['.js', '.jsx', '.ts', '.tsx'],
     alias: {
diff --git a/language/build.gradle b/language/build.gradle
index f2b20ab5..7b9f8d75 100644
--- a/language/build.gradle
+++ b/language/build.gradle
@@ -16,7 +16,6 @@ dependencies {
         mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
         mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
         mwe2 "org.eclipse.xtext:xtext-antlr-generator:${xtextAntlrGeneratorVersion}"
-        mwe2 project(':refinery-language-mwe2')
 }
 
 sourceSets {
@@ -41,7 +40,6 @@ def generateXtextLanguage = tasks.register('generateXtextLanguage', JavaExec) {
         outputs.dir 'src/testFixtures/xtext-gen'
         outputs.dir '../language-ide/src/main/xtext-gen'
         outputs.dir '../language-web/src/main/xtext-gen'
-        outputs.dir '../language-web/build/generated/sources/xtext'
         args += 'src/main/java/tools/refinery/language/GenerateProblem.mwe2'
         args += '-p'
         args += "rootPath=/${projectDir}/.."
@@ -58,7 +56,6 @@ tasks.named('clean') {
         delete 'src/testFixtures/xtext-gen'
         delete '../language-ide/src/main/xtext-gen'
         delete '../language-web/src/main/xtext-gen'
-        delete '../language-web/build/generated/sources/xtext'
 }
 
 sonarqube.properties {
diff --git a/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
index 1b177c94..79eb79a7 100644
--- a/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
+++ b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
@@ -3,8 +3,6 @@ module tools.refinery.language.GenerateProblem
 import org.eclipse.xtext.xtext.generator.*
 import org.eclipse.xtext.xtext.generator.model.project.*
 
-import tools.refinery.language.mwe2.*
-
 var rootPath = ".."
 
 Workflow {
@@ -20,11 +18,6 @@ Workflow {
                                 genericIde = {
                                         name = "language-ide"
                                 }
-                                web = {
-                                        enabled = true
-                                        name = "language-web"
-                                        assets = "../language-web/build/generated/sources/xtext"
-                                }
                                 mavenLayout = true
                         }
                         code = {
@@ -53,13 +46,6 @@ Workflow {
                                 skipXbaseTestingPackage = true
                                 junitVersion = "5"
                         }
-                        webSupport = ProblemWebIntegrationFragment {
-                                highlightingPath = "js/mode-problem.js"
-                                generateHtmlExample = false
-                                generateJettyLauncher = false
-                                generateServlet = false
-                                generateWebXml = false
-                        }
                 }
         }
 }
diff --git a/settings.gradle b/settings.gradle
index 9edf237f..0e237de1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,7 +3,6 @@ rootProject.name = 'refinery'
 include 'language'
 include 'language-ide'
 include 'language-model'
-include 'language-mwe2'
 include 'language-to-store'
 include 'language-web'
 include 'store'