3 files changed, 31 insertions, 15 deletions

diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java
index a09a475b..8dad8f8a 100644
--- a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java
+++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java
@@ -24,9 +24,9 @@ import tools.refinery.language.model.problem.*;
 import tools.refinery.language.naming.NamingUtil;
 import tools.refinery.language.naming.ProblemQualifiedNameConverter;
 import tools.refinery.language.resource.ProblemResourceDescriptionStrategy;
+import tools.refinery.language.scoping.imports.ImportAdapterProvider;
 import tools.refinery.language.scoping.imports.ImportCollector;
 import tools.refinery.language.utils.BuiltinSymbols;
-import tools.refinery.language.utils.ProblemDesugarer;
 import tools.refinery.language.utils.ProblemUtil;
 import tools.refinery.language.validation.ReferenceCounter;
 
@@ -43,10 +43,10 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider
         private ReferenceCounter referenceCounter;
 
         @Inject
-        private ProblemDesugarer desugarer;
+        private ImportCollector importCollector;
 
         @Inject
-        private ImportCollector importCollector;
+        private ImportAdapterProvider importAdapterProvider;
 
         @Override
         protected Iterable<IEObjectDescription> queryScope(IScope scope, CrossReference crossReference,
@@ -125,16 +125,27 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider
                         return oppositeShouldBeVisible(candidateReferenceDeclaration, context);
                 }
 
-                var builtinSymbolsOption = desugarer.getBuiltinSymbols(context.getRootModel());
-                if (builtinSymbolsOption.isEmpty()) {
-                        return true;
+                if (eReference.equals(ProblemPackage.Literals.VARIABLE_OR_NODE_EXPR__VARIABLE_OR_NODE)) {
+                        var assignedVariable = getAssignedVariable(context.getCurrentModel());
+                        if (assignedVariable != null && Objects.equals(assignedVariable, candidate.getEObjectOrProxy())) {
+                                return false;
+                        }
                 }
-                var builtinSymbols = builtinSymbolsOption.get();
+
+                var builtinSymbols = importAdapterProvider.getBuiltinSymbols(context.getResource());
 
                 return builtinSymbolAwareShouldBeVisible(candidate, context, eReference, builtinSymbols,
                                 candidateEObjectOrProxy);
         }
 
+        private VariableOrNode getAssignedVariable(EObject context) {
+                var assignmentExpr = EcoreUtil2.getContainerOfType(context, AssignmentExpr.class);
+                if (assignmentExpr != null && assignmentExpr.getLeft() instanceof VariableOrNodeExpr variableOrNodeExpr) {
+                        return variableOrNodeExpr.getVariableOrNode();
+                }
+                return null;
+        }
+
         private boolean importedModuleShouldBeVisible(IEObjectDescription candidate, ContentAssistContext context) {
                 var moduleKind = candidate.getUserData(ProblemResourceDescriptionStrategy.MODULE_KIND);
                 if (!ModuleKind.MODULE.getName().equals(moduleKind)) {
@@ -187,8 +198,8 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider
                         if (builtinSymbols.exists().equals(candidateEObjectOrProxy)) {
                                 return false;
                         }
-                        var arity = candidate.getUserData(ProblemResourceDescriptionStrategy.ARITY);
-                        return arity == null || arity.equals("1");
+                        return ProblemResourceDescriptionStrategy.TYPE_LIKE_TRUE.equals(
+                                        candidate.getUserData(ProblemResourceDescriptionStrategy.TYPE_LIKE));
                 }
 
                 if (eReference.equals(ProblemPackage.Literals.CLASS_DECLARATION__SUPER_TYPES)) {
diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
index 891c73c7..06f0e758 100644
--- a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
+++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
@@ -18,7 +18,6 @@ import org.eclipse.xtext.service.OperationCanceledManager;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.jetbrains.annotations.NotNull;
 import tools.refinery.language.model.problem.*;
-import tools.refinery.language.utils.ProblemDesugarer;
 import tools.refinery.language.utils.ProblemUtil;
 
 import java.util.List;
@@ -26,6 +25,8 @@ import java.util.List;
 public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator {
         private static final String BUILTIN_CLASS = "builtin";
         private static final String ABSTRACT_CLASS = "abstract";
+        private static final String DATATYPE_CLASS = "datatype";
+        private static final String AGGREGATOR_CLASS = "aggregator";
         private static final String CONTAINMENT_CLASS = "containment";
         private static final String ERROR_CLASS = "error";
         private static final String NODE_CLASS = "node";
@@ -36,9 +37,6 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
         private OperationCanceledManager operationCanceledManager;
 
         @Inject
-        private ProblemDesugarer desugarer;
-
-        @Inject
         private TypeHashProvider typeHashProvider;
 
         @Override
@@ -112,8 +110,14 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                 if (eObject instanceof ClassDeclaration classDeclaration && classDeclaration.isAbstract()) {
                         classesBuilder.add(ABSTRACT_CLASS);
                 }
+                if (eObject instanceof DatatypeDeclaration) {
+                        classesBuilder.add(DATATYPE_CLASS);
+                }
+                if (eObject instanceof AggregatorDeclaration) {
+                        classesBuilder.add(AGGREGATOR_CLASS);
+                }
                 if (eObject instanceof ReferenceDeclaration referenceDeclaration
-                                && desugarer.isContainmentReference(referenceDeclaration)) {
+                                && ProblemUtil.isContainmentReference(referenceDeclaration)) {
                         classesBuilder.add(CONTAINMENT_CLASS);
                 }
                 if (isError && reference != null) {
diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/TypeHashProvider.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/TypeHashProvider.java
index 82a6af06..2821e1b6 100644
--- a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/TypeHashProvider.java
+++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/TypeHashProvider.java
@@ -17,6 +17,7 @@ import org.eclipse.xtext.scoping.impl.GlobalResourceDescriptionProvider;
 import org.eclipse.xtext.util.IResourceScopeCache;
 import tools.refinery.language.documentation.DocumentationCommentParser;
 import tools.refinery.language.model.problem.*;
+import tools.refinery.language.naming.NamingUtil;
 import tools.refinery.language.resource.ProblemResourceDescriptionStrategy;
 import tools.refinery.language.scoping.imports.ImportCollector;
 import tools.refinery.language.utils.ProblemUtil;
@@ -55,7 +56,7 @@ public class TypeHashProvider {
                 if (qualifiedName == null) {
                         return null;
                 }
-                var qualifiedNameString = qualifiedNameConverter.toString(qualifiedName);
+                var qualifiedNameString = qualifiedNameConverter.toString(NamingUtil.addRootPrefix(qualifiedName));
                 var problem = EcoreUtil2.getContainerOfType(relation, Problem.class);
                 if (problem == null) {
                         return null;