Electric semicolons

4 files changed, 11 insertions, 9 deletions

diff --git a/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java b/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java
index 7cc736bc..c8a2c58c 100644
--- a/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java
+++ b/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java
@@ -51,9 +51,10 @@ public class ProblemWebIntegrationFragment extends WebIntegrationFragment {
                 patterns.putAll("predicateBody", patterns.get("start"));
                 patterns.put("start", "{indent: true, push: \"predicateBody\", regex: \":-\"}");
                 patterns.put("predicateBody", "{dedent: true, dedentIfLineStart: false, pop: true, regex: \"\\\\.\\\\s*$\"}");
+                patterns.put("predicateBody", "{indent: true, dedent: true, regex: \"[;]\"}");
                 // We must repeat the keyword rule here, because Xtext only adds it to "main" later.
                 patterns.put("predicateBody", "{token: \"keyword\", regex: \"\\\\b(?:\" + keywords + \")\\\\b\"}");
-                patterns.put("meta", "electricChars: \"])]\"");
+                patterns.put("meta", "electricChars: \"])];\"");
                 return patterns;
         }
 }
diff --git a/language-web/src/main/webapp/index.html b/language-web/src/main/webapp/index.html
index 753ed63a..97c4dbab 100644
--- a/language-web/src/main/webapp/index.html
+++ b/language-web/src/main/webapp/index.html
@@ -17,22 +17,22 @@
                  data-editor-enable-formatting-action="true"
                  data-editor-send-full-text="false"
             ><pre>class Family {
-    contains Person[] members
+  contains Person[] members
 }
 
 class Person {
-    Person[] children opposite parent
-    Person parent opposite children
-    TaxStatus[1] taxStatus
+  Person[] children opposite parent
+  Person parent opposite children
+  TaxStatus[1] taxStatus
 }
 
 enum TaxStatus {
-        child, student, adult, retired
+  child, student, adult, retired
 }
 
 % A child cannot have any dependents.
 error invalidTaxStatus(Person p) :-
-        taxStatus(p, child), children(p, _q).
+  taxStatus(p, child), children(p, _q).
 
 Family('family').
 members('family', anne).
diff --git a/language-web/src/main/webapp/script.js b/language-web/src/main/webapp/script.js
index 818a056c..4b466fed 100644
--- a/language-web/src/main/webapp/script.js
+++ b/language-web/src/main/webapp/script.js
@@ -16,5 +16,5 @@ require.config({
     }]
 });
 require(["xtext-resources/generated/mode-problem", "xtext/xtext-codemirror"], function(mode, xtext) {
-        xtext.createEditor({baseUrl: baseUrl, indentUnit: 4,});
+        xtext.createEditor({baseUrl: baseUrl, indentUnit: 2,});
 });
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 1640d13d..92adcff1 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
@@ -21,7 +21,7 @@ define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, Simp
                 meta: {
                         dontIndentStates: ["comment"],
                         lineComment: "%",
-                        electricChars: "])]"
+                        electricChars: "])];"
                 },
                 predicateBody: [
                         {token: "comment", regex: "\\/\\*", next : "comment"},
@@ -34,6 +34,7 @@ define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, Simp
                         {token: "lparen", indent: true, regex: "[[({]"},
                         {token: "rparen", dedent: true, dedentIfLineStart: true, regex: "[\\])}]"},
                         {dedent: true, dedentIfLineStart: false, pop: true, regex: "\\.\\s*$"},
+                        {indent: true, dedent: true, regex: "[;]"},
                         {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
                 ]
         });