aboutsummaryrefslogtreecommitdiffstats
path: root/language
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2021-10-11 01:13:32 +0200
committerLibravatar Kristóf Marussy <kristof@marussy.com>2021-10-31 19:26:10 +0100
commit1d7f4031d614ae16b53de5a84312a71346da0c9c (patch)
tree961eedc36eca26af61baa862e5cf4b9d1b04de79 /language
parentfeat(web): experiment with Lezer parser (diff)
downloadrefinery-1d7f4031d614ae16b53de5a84312a71346da0c9c.tar.gz
refinery-1d7f4031d614ae16b53de5a84312a71346da0c9c.tar.zst
refinery-1d7f4031d614ae16b53de5a84312a71346da0c9c.zip
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.
Diffstat (limited to 'language')
-rw-r--r--language/build.gradle3
-rw-r--r--language/src/main/java/tools/refinery/language/GenerateProblem.mwe214
2 files changed, 0 insertions, 17 deletions
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 {
16 mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}" 16 mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
17 mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}" 17 mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
18 mwe2 "org.eclipse.xtext:xtext-antlr-generator:${xtextAntlrGeneratorVersion}" 18 mwe2 "org.eclipse.xtext:xtext-antlr-generator:${xtextAntlrGeneratorVersion}"
19 mwe2 project(':refinery-language-mwe2')
20} 19}
21 20
22sourceSets { 21sourceSets {
@@ -41,7 +40,6 @@ def generateXtextLanguage = tasks.register('generateXtextLanguage', JavaExec) {
41 outputs.dir 'src/testFixtures/xtext-gen' 40 outputs.dir 'src/testFixtures/xtext-gen'
42 outputs.dir '../language-ide/src/main/xtext-gen' 41 outputs.dir '../language-ide/src/main/xtext-gen'
43 outputs.dir '../language-web/src/main/xtext-gen' 42 outputs.dir '../language-web/src/main/xtext-gen'
44 outputs.dir '../language-web/build/generated/sources/xtext'
45 args += 'src/main/java/tools/refinery/language/GenerateProblem.mwe2' 43 args += 'src/main/java/tools/refinery/language/GenerateProblem.mwe2'
46 args += '-p' 44 args += '-p'
47 args += "rootPath=/${projectDir}/.." 45 args += "rootPath=/${projectDir}/.."
@@ -58,7 +56,6 @@ tasks.named('clean') {
58 delete 'src/testFixtures/xtext-gen' 56 delete 'src/testFixtures/xtext-gen'
59 delete '../language-ide/src/main/xtext-gen' 57 delete '../language-ide/src/main/xtext-gen'
60 delete '../language-web/src/main/xtext-gen' 58 delete '../language-web/src/main/xtext-gen'
61 delete '../language-web/build/generated/sources/xtext'
62} 59}
63 60
64sonarqube.properties { 61sonarqube.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
3import org.eclipse.xtext.xtext.generator.* 3import org.eclipse.xtext.xtext.generator.*
4import org.eclipse.xtext.xtext.generator.model.project.* 4import org.eclipse.xtext.xtext.generator.model.project.*
5 5
6import tools.refinery.language.mwe2.*
7
8var rootPath = ".." 6var rootPath = ".."
9 7
10Workflow { 8Workflow {
@@ -20,11 +18,6 @@ Workflow {
20 genericIde = { 18 genericIde = {
21 name = "language-ide" 19 name = "language-ide"
22 } 20 }
23 web = {
24 enabled = true
25 name = "language-web"
26 assets = "../language-web/build/generated/sources/xtext"
27 }
28 mavenLayout = true 21 mavenLayout = true
29 } 22 }
30 code = { 23 code = {
@@ -53,13 +46,6 @@ Workflow {
53 skipXbaseTestingPackage = true 46 skipXbaseTestingPackage = true
54 junitVersion = "5" 47 junitVersion = "5"
55 } 48 }
56 webSupport = ProblemWebIntegrationFragment {
57 highlightingPath = "js/mode-problem.js"
58 generateHtmlExample = false
59 generateJettyLauncher = false
60 generateServlet = false
61 generateWebXml = false
62 }
63 } 49 }
64 } 50 }
65} 51}