Merge pull request #8 from kris7t/cm6

Switch to CodeMirror 6 editor and WebSocket-based transport for Xtext

3 files changed, 65 insertions, 38 deletions

diff --git a/language-ide/src/main/java/tools/refinery/language/ide/ProblemIdeModule.java b/language-ide/src/main/java/tools/refinery/language/ide/ProblemIdeModule.java
index 5327f7b4..3502c29f 100644
--- a/language-ide/src/main/java/tools/refinery/language/ide/ProblemIdeModule.java
+++ b/language-ide/src/main/java/tools/refinery/language/ide/ProblemIdeModule.java
@@ -3,16 +3,22 @@
  */
 package tools.refinery.language.ide;
 
+import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher;
 import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator;
 
+import tools.refinery.language.ide.contentassist.FuzzyMatcher;
 import tools.refinery.language.ide.syntaxcoloring.ProblemSemanticHighlightingCalculator;
 
 /**
  * Use this class to register ide components.
  */
 public class ProblemIdeModule extends AbstractProblemIdeModule {
-
         public Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
                 return ProblemSemanticHighlightingCalculator.class;
         }
+        
+        @Override
+        public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
+                return FuzzyMatcher.class;
+        }
 }
diff --git a/language-ide/src/main/java/tools/refinery/language/ide/contentassist/FuzzyMatcher.java b/language-ide/src/main/java/tools/refinery/language/ide/contentassist/FuzzyMatcher.java
new file mode 100644
index 00000000..fe722ca1
--- /dev/null
+++ b/language-ide/src/main/java/tools/refinery/language/ide/contentassist/FuzzyMatcher.java
@@ -0,0 +1,44 @@
+package tools.refinery.language.ide.contentassist;
+
+import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher;
+
+import com.google.inject.Singleton;
+
+/**
+ * Implements the candidate matching algoritm used by CodeMirror 6.
+ * 
+ * Using this class ensures that the same candidates will be returned when
+ * filtering content assist proposals on the server as on the client.
+ * 
+ * The matching is "fuzzy" (<code>fzf</code>-like), i.e., the prefix characters
+ * may occur anywhere in the name, but must be in the same order as in the
+ * prefix.
+ * 
+ * @author Kristóf Marussy
+ */
+@Singleton
+public class FuzzyMatcher implements IPrefixMatcher {
+        @Override
+        public boolean isCandidateMatchingPrefix(String name, String prefix) {
+                var nameIgnoreCase = name.toLowerCase();
+                var prefixIgnoreCase = prefix.toLowerCase();
+                int prefixLength = prefixIgnoreCase.length();
+                if (prefixLength == 0) {
+                        return true;
+                }
+                int nameLength = nameIgnoreCase.length();
+                if (prefixLength > nameLength) {
+                        return false;
+                }
+                int prefixIndex = 0;
+                for (int nameIndex = 0; nameIndex < nameLength; nameIndex++) {
+                        if (nameIgnoreCase.charAt(nameIndex) == prefixIgnoreCase.charAt(prefixIndex)) {
+                                prefixIndex++;
+                                if (prefixIndex == prefixLength) {
+                                        return true;
+                                }
+                        }
+                }
+                return false;
+        }
+}
diff --git a/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java b/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
index 76a67f96..d9abf12d 100644
--- a/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
+++ b/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
@@ -17,30 +17,20 @@ import com.google.inject.Inject;
 
 import tools.refinery.language.model.ProblemUtil;
 import tools.refinery.language.model.problem.ClassDeclaration;
-import tools.refinery.language.model.problem.EnumDeclaration;
 import tools.refinery.language.model.problem.NamedElement;
 import tools.refinery.language.model.problem.Node;
-import tools.refinery.language.model.problem.Parameter;
 import tools.refinery.language.model.problem.PredicateDefinition;
 import tools.refinery.language.model.problem.ProblemPackage;
 import tools.refinery.language.model.problem.ReferenceDeclaration;
-import tools.refinery.language.model.problem.Variable;
 
 public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator {
-        private static final String BUILTIN_CLASS = "cm-keyword";
-        private static final String CLASS_CLASS = "problem-class";
-        private static final String ABSTRACT_CLASS = "problem-abstract";
-        private static final String ENUM_CLASS = "problem-enum";
-        private static final String REFERENCE_CLASS = "problem-reference";
-        private static final String CONTAINMENT_CLASS = "problem-containment";
-        private static final String PREDICATE_CLASS = "problem-predicate";
-        private static final String ERROR_CLASS = "problem-error";
-        private static final String NODE_CLASS = "problem-node";
-        private static final String UNIQUE_NODE_CLASS = "problem-unique-node";
-        private static final String NEW_NODE_CLASS = "problem-new-node";
-        private static final String PARAMETER_CLASS = "problem-parameter";
-        private static final String VARIABLE_CLASS = "problem-variable";
-        private static final String SINGLETON_VARIABLE_CLASS = "problem-singleton-variable";
+        private static final String BUILTIN_CLASS = "builtin";
+        private static final String ABSTRACT_CLASS = "abstract";
+        private static final String CONTAINMENT_CLASS = "containment";
+        private static final String ERROR_CLASS = "error";
+        private static final String NODE_CLASS = "node";
+        private static final String UNIQUE_NODE_CLASS = "unique";
+        private static final String NEW_NODE_CLASS = "new";
 
         @Inject
         private OperationCanceledManager operationCanceledManager;
@@ -57,7 +47,7 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                 if (!(object instanceof NamedElement)) {
                         return;
                 }
-                String[] highlightClass = getHighlightClass(object);
+                String[] highlightClass = getHighlightClass(object, null);
                 if (highlightClass.length > 0) {
                         highlightFeature(acceptor, object, ProblemPackage.Literals.NAMED_ELEMENT__NAME, highlightClass);
                 }
@@ -80,7 +70,7 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
 
         protected void highlightSingleValue(EObject object, EReference reference, IHighlightedPositionAcceptor acceptor) {
                 EObject valueObj = (EObject) object.eGet(reference);
-                String[] highlightClass = getHighlightClass(valueObj);
+                String[] highlightClass = getHighlightClass(valueObj, reference);
                 if (highlightClass.length > 0) {
                         highlightFeature(acceptor, object, reference, highlightClass);
                 }
@@ -94,41 +84,37 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                 for (var i = 0; i < size; i++) {
                         EObject valueInList = values.get(i);
                         INode node = nodes.get(i);
-                        String[] highlightClass = getHighlightClass(valueInList);
+                        String[] highlightClass = getHighlightClass(valueInList, reference);
                         if (highlightClass.length > 0) {
                                 highlightNode(acceptor, node, highlightClass);
                         }
                 }
         }
 
-        protected String[] getHighlightClass(EObject eObject) {
+        protected String[] getHighlightClass(EObject eObject, EReference reference) {
                 if (ProblemUtil.isBuiltIn(eObject)) {
                         return new String[] { BUILTIN_CLASS };
                 }
                 ImmutableList.Builder<String> classesBuilder = ImmutableList.builder();
                 if (eObject instanceof ClassDeclaration classDeclaration) {
-                        classesBuilder.add(CLASS_CLASS);
                         if (classDeclaration.isAbstract()) {
                                 classesBuilder.add(ABSTRACT_CLASS);
                         }
                 }
-                if (eObject instanceof EnumDeclaration) {
-                        classesBuilder.add(ENUM_CLASS);
-                }
                 if (eObject instanceof ReferenceDeclaration referenceDeclaration) {
-                        classesBuilder.add(REFERENCE_CLASS);
                         if (referenceDeclaration.isContainment()) {
                                 classesBuilder.add(CONTAINMENT_CLASS);
                         }
                 }
                 if (eObject instanceof PredicateDefinition predicateDefinition) {
-                        classesBuilder.add(PREDICATE_CLASS);
                         if (predicateDefinition.isError()) {
                                 classesBuilder.add(ERROR_CLASS);
                         }
                 }
                 if (eObject instanceof Node node) {
-                        classesBuilder.add(NODE_CLASS);
+                        if (reference == ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE) {
+                                classesBuilder.add(NODE_CLASS);
+                        }
                         if (ProblemUtil.isUniqueNode(node)) {
                                 classesBuilder.add(UNIQUE_NODE_CLASS);
                         }
@@ -136,15 +122,6 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                                 classesBuilder.add(NEW_NODE_CLASS);
                         }
                 }
-                if (eObject instanceof Parameter) {
-                        classesBuilder.add(PARAMETER_CLASS);
-                }
-                if (eObject instanceof Variable variable) {
-                        classesBuilder.add(VARIABLE_CLASS);
-                        if (ProblemUtil.isSingletonVariable(variable)) {
-                                classesBuilder.add(SINGLETON_VARIABLE_CLASS);
-                        }
-                }
                 List<String> classes = classesBuilder.build();
                 return classes.toArray(new String[0]);
         }