1 files changed, 24 insertions, 6 deletions

diff --git a/language-web/src/main/webapp/xtext-resources/generated/mode-problem.js b/language-web/src/main/webapp/xtext-resources/generated/mode-problem.js
index 89373b1c..1640d13d 100644
--- a/language-web/src/main/webapp/xtext-resources/generated/mode-problem.js
+++ b/language-web/src/main/webapp/xtext-resources/generated/mode-problem.js
@@ -2,12 +2,16 @@ define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, Simp
         var keywords = "abstract|class|contains|enum|error|extends|false|opposite|pred|problem|refers|scope|true|unknown";
         CodeMirror.defineSimpleMode("xtext/problem", {
                 start: [
-                        {token: "comment", regex: "\\/\\/.*$"},
                         {token: "comment", regex: "\\/\\*", next : "comment"},
                         {token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},
-                        {token: "constant.numeric", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},
-                        {token: "lparen", regex: "[\\[({]"},
-                        {token: "rparen", 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, dedentIfLineStart: true, regex: "[\\])}]"},
+                        {indent: true, push: "predicateBody", regex: ":-"},
                         {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
                 ],
                 comment: [
@@ -16,7 +20,21 @@ define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, Simp
                 ],
                 meta: {
                         dontIndentStates: ["comment"],
-                        lineComment: "//"
-                }
+                        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, dedentIfLineStart: true, regex: "[\\])}]"},
+                        {dedent: true, dedentIfLineStart: false, pop: true, regex: "\\.\\s*$"},
+                        {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
+                ]
         });
 });