1 files changed, 5 insertions, 3 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 92adcff1..ba39dd13 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
@@ -1,5 +1,6 @@
 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";
+        var extraKeywords = "!|\\(|\\)|\\*|\\+|,|-|\\.|:|;|=|\\?|\\[|\\]|\\{|\\}";
         CodeMirror.defineSimpleMode("xtext/problem", {
                 start: [
                         {token: "comment", regex: "\\/\\*", next : "comment"},
@@ -10,9 +11,10 @@ define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, Simp
                         {token: "comment", regex: "%.*$"},
                         {token: "comment", regex: "\\/\\/.*$"},
                         {token: "lparen", indent: true, regex: "[[({]"},
-                        {token: "rparen", dedent: true, dedentIfLineStart: true, regex: "[\\])}]"},
+                        {token: "rparen", dedent: true, regex: "[\\])}]"},
                         {indent: true, push: "predicateBody", regex: ":-"},
-                        {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
+                        {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"},
+                        {token: "keyword", regex: "(?:^|\\s)(?:" + extraKeywords + ")(?=[\\s.:;,!?+\\-*/&|<>()[\\]{}]|$)"}
                 ],
                 comment: [
                         {token: "comment", regex: ".*?\\*\\/", next : "start"},
@@ -32,7 +34,7 @@ define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, Simp
                         {token: "comment", regex: "%.*$"},
                         {token: "comment", regex: "\\/\\/.*$"},
                         {token: "lparen", indent: true, regex: "[[({]"},
-                        {token: "rparen", dedent: true, dedentIfLineStart: 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"}