3 files changed, 8 insertions, 51 deletions

diff --git a/language-web/src/main/js-gen/mode-problem.js b/language-web/src/main/js-gen/mode-problem.js
deleted file mode 100644
index d962a0bb..00000000
--- a/language-web/src/main/js-gen/mode-problem.js
+++ /dev/null
@@ -1,41 +0,0 @@
-define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, SimpleMode) {
-        var keywords = "abstract|class|contains|enum|error|extends|false|opposite|pred|problem|refers|scope|true|unknown";
-        CodeMirror.defineSimpleMode("xtext/problem", {
-                start: [
-                        {token: "comment", regex: "\\/\\*", next : "comment"},
-                        {token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},
-                        {token: "quoted-name", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},
-                        {token: "number", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},
-                        {token: "number", regex: "[*]"},
-                        {token: "comment", regex: "%.*$"},
-                        {token: "comment", regex: "\\/\\/.*$"},
-                        {token: "lparen", indent: true, regex: "[[({]"},
-                        {token: "rparen", dedent: true, regex: "[\\])}]"},
-                        {indent: true, push: "predicateBody", regex: ":-"},
-                        {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
-                ],
-                comment: [
-                        {token: "comment", regex: ".*?\\*\\/", next : "start"},
-                        {token: "comment", regex: ".+"}
-                ],
-                meta: {
-                        dontIndentStates: ["comment"],
-                        lineComment: "%",
-                        electricChars: "])];"
-                },
-                predicateBody: [
-                        {token: "comment", regex: "\\/\\*", next : "comment"},
-                        {token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},
-                        {token: "quoted-name", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},
-                        {token: "number", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},
-                        {token: "number", regex: "[*]"},
-                        {token: "comment", regex: "%.*$"},
-                        {token: "comment", regex: "\\/\\/.*$"},
-                        {token: "lparen", indent: true, regex: "[[({]"},
-                        {token: "rparen", dedent: true, regex: "[\\])}]"},
-                        {dedent: true, dedentIfLineStart: false, pop: true, regex: "\\.\\s*$"},
-                        {indent: true, dedent: true, regex: "[;]"},
-                        {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
-                ]
-        });
-});
diff --git a/language-web/webpack.config.js b/language-web/webpack.config.js
index a44260a1..bd999a85 100644
--- a/language-web/webpack.config.js
+++ b/language-web/webpack.config.js
@@ -17,11 +17,9 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.jsx?$/,
-        include: {
-          and: [path.resolve(__dirname, 'src/main/js')],
-          not: [path.resolve(__dirname, 'src/main/js/xtext')],
-        },
+        test: /\.jsx?$/i,
+        include: [path.resolve(__dirname, 'src/main/js')],
+        exclude: [path.resolve(__dirname, 'src/main/js/xtext')],
         loader: 'babel-loader',
         options: {
           presets: [
@@ -30,7 +28,7 @@ module.exports = {
         },
       },
       {
-        test: /\.scss$/,
+        test: /\.scss$/i,
         use: [
           devMode ? 'style-loader' : MiniCssExtractPlugin.loader,
           'css-loader',
@@ -43,7 +41,7 @@ module.exports = {
         ]
       },
       {
-        test: /\.(gif|png|jpe?g|svg)$/,
+        test: /\.(gif|png|jpe?g|svg)$/i,
         use: [
           'file-loader',
           {
@@ -60,7 +58,7 @@ module.exports = {
     modules: [
       'node_modules',
       path.resolve(__dirname, 'src/main/js'),
-      path.resolve(__dirname, 'src/main/js-gen'),
+      path.resolve(__dirname, 'build/generated/sources/xtext/js'),
     ],
     extensions: ['.js', '.jsx'],
     alias: {
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 b/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2
index 6f265bd5..18f70080 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2
+++ b/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2
@@ -22,7 +22,7 @@ Workflow {
                                 web = {
                                         enabled = true
                                         name = "language-web"
-                                        assets = "../language-web/src/main/js-gen"
+                                        assets = "../language-web/build/generated/sources/xtext"
                                 }
                                 mavenLayout = true
                         }
@@ -49,7 +49,7 @@ Workflow {
                                 junitVersion = "5"
                         }
                         webSupport = ProblemWebIntegrationFragment {
-                                highlightingPath = "mode-problem.js"
+                                highlightingPath = "js/mode-problem.js"
                                 generateHtmlExample = false
                         }
                 }