Customize client-side CodeMirror mode

3 files changed, 14 insertions, 14 deletions

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 76563e2c..a63681c8 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
@@ -3,6 +3,8 @@ module org.eclipse.viatra.solver.language.GenerateProblem
 import org.eclipse.xtext.xtext.generator.*
 import org.eclipse.xtext.xtext.generator.model.project.*
 
+import org.eclipse.viatra.solver.language.mwe2.*
+
 var rootPath = ".."
 
 Workflow {
@@ -14,12 +16,12 @@ Workflow {
                                 runtimeTest = {
                                         enabled = true
                                 }
-                genericIde = {
-                    name = "language-ide"
-                }
+                                genericIde = {
+                                        name = "language-ide"
+                                }
                                 web = {
                                         enabled = true
-                    name = "language-web"
+                                        name = "language-web"
                                 }
                                 mavenLayout = true
                         }
@@ -30,18 +32,15 @@ Workflow {
                                 preferXtendStubs = false
                         }
                 }
-                
+
                 language = StandardLanguage {
                         name = "org.eclipse.viatra.solver.language.Problem"
                         fileExtensions = "problem"
                         referencedResource = "platform:/resource/language-model/model/problem.genmodel"
-
                         serializer = {
                                 generateStub = false
                         }
                         validator = {
-                                // composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
-                                // Generates checks for @Deprecated grammar annotations, an IssueProvider and a corresponding PropertyPage
                                 generateDeprecationValidation = true
                         }
                         generator = {
@@ -50,10 +49,7 @@ Workflow {
                         junitSupport = {
                                 junitVersion = "5"
                         }
-                        webSupport = {
-                                framework = "CodeMirror"
-                                suppressPattern = "string_singleQuote"
-                        }
+                        webSupport = ProblemWebIntegrationFragment {}
                 }
         }
 }
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext b/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
index 5f8b35f3..466988d8 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
+++ b/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
@@ -103,7 +103,7 @@ QuotedOrUnquotedId:
         QUOTED_ID | Identifier;
 
 QualifiedName:
-        QUOTED_ID | Identifier (":" Identifier)* (":" QUOTED_ID)?;
+        QUOTED_ID | Identifier ("::" Identifier)* ("::" QUOTED_ID)?;
 
 Identifier:
         ID | "true" | "false";
@@ -114,3 +114,7 @@ terminal STRING:
 
 terminal QUOTED_ID:
         "'" ('\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\' | "'"))* "'";
+
+@Override
+terminal SL_COMMENT:
+        ('%' | '//') !('\n'|'\r')* ('\r'? '\n')?;
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java b/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java
index 3cee31f3..e55e5dda 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java
+++ b/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java
@@ -6,7 +6,7 @@ import com.google.inject.Singleton;
 
 @Singleton
 public class ProblemQualifiedNameConverter extends IQualifiedNameConverter.DefaultImpl {
-        public static final String DELIMITER = ":";
+        public static final String DELIMITER = "::";
         
         @Override
         public String getDelimiter() {