3 files changed, 83 insertions, 20 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 166b4400..a09a475b 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
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -15,14 +15,16 @@ import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.GrammarUtil;
 import org.eclipse.xtext.ide.editor.contentassist.ContentAssistContext;
 import org.eclipse.xtext.ide.editor.contentassist.IdeCrossrefProposalProvider;
-import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.IEObjectDescription;
 import org.eclipse.xtext.scoping.IScope;
 import org.eclipse.xtext.xtext.CurrentTypeFinder;
 import org.jetbrains.annotations.Nullable;
 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.ImportCollector;
 import tools.refinery.language.utils.BuiltinSymbols;
 import tools.refinery.language.utils.ProblemDesugarer;
 import tools.refinery.language.utils.ProblemUtil;
@@ -43,17 +45,18 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider
         @Inject
         private ProblemDesugarer desugarer;
 
+        @Inject
+        private ImportCollector importCollector;
+
         @Override
         protected Iterable<IEObjectDescription> queryScope(IScope scope, CrossReference crossReference,
                                                                                                            ContentAssistContext context) {
-                var eObjectDescriptionsByName = new HashMap<QualifiedName, List<IEObjectDescription>>();
+                var eObjectDescriptionsByName = new HashMap<ProblemResourceDescriptionStrategy.ShadowingKey,
+                                List<IEObjectDescription>>();
                 for (var candidate : super.queryScope(scope, crossReference, context)) {
                         if (isExistingObject(candidate, crossReference, context)) {
-                                // {@code getQualifiedName()} will refer to the full name for objects that are loaded from the global
-                                // scope, but {@code getName()} returns the qualified name that we set in
-                                // {@code ProblemResourceDescriptionStrategy}.
-                                var qualifiedName = candidate.getName();
-                                var candidateList = eObjectDescriptionsByName.computeIfAbsent(qualifiedName,
+                                var shadowingKey = ProblemResourceDescriptionStrategy.getShadowingKey(candidate);
+                                var candidateList = eObjectDescriptionsByName.computeIfAbsent(shadowingKey,
                                                 ignored -> new ArrayList<>());
                                 candidateList.add(candidate);
                         }
@@ -61,7 +64,7 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider
                 var eObjectDescriptions = new ArrayList<IEObjectDescription>();
                 for (var candidates : eObjectDescriptionsByName.values()) {
                         if (candidates.size() == 1) {
-                                var candidate = candidates.get(0);
+                                var candidate = candidates.getFirst();
                                 if (shouldBeVisible(candidate, crossReference, context)) {
                                         eObjectDescriptions.add(candidate);
                                 }
@@ -96,6 +99,11 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider
 
         protected boolean shouldBeVisible(IEObjectDescription candidate, CrossReference crossReference,
                                                                           ContentAssistContext context) {
+                if (NamingUtil.isFullyQualified(candidate.getName()) &&
+                                !context.getPrefix().startsWith(ProblemQualifiedNameConverter.DELIMITER)) {
+                        // Do not propose names with a root prefix unless explicitly asked for.
+                        return false;
+                }
                 var errorPredicate = candidate.getUserData(ProblemResourceDescriptionStrategy.ERROR_PREDICATE);
                 if (ProblemResourceDescriptionStrategy.ERROR_PREDICATE_TRUE.equals(errorPredicate)) {
                         return false;
@@ -106,6 +114,10 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider
                         return true;
                 }
 
+                if (eReference == ProblemPackage.Literals.IMPORT_STATEMENT__IMPORTED_MODULE) {
+                        return importedModuleShouldBeVisible(candidate, context);
+                }
+
                 var candidateEObjectOrProxy = candidate.getEObjectOrProxy();
 
                 if (eReference.equals(ProblemPackage.Literals.REFERENCE_DECLARATION__OPPOSITE) &&
@@ -123,6 +135,20 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider
                                 candidateEObjectOrProxy);
         }
 
+        private boolean importedModuleShouldBeVisible(IEObjectDescription candidate, ContentAssistContext context) {
+                var moduleKind = candidate.getUserData(ProblemResourceDescriptionStrategy.MODULE_KIND);
+                if (!ModuleKind.MODULE.getName().equals(moduleKind)) {
+                        return false;
+                }
+                var resource = context.getResource();
+                var candidateResourceUri = candidate.getEObjectURI().trimFragment();
+                if (candidateResourceUri.equals(resource.getURI())) {
+                        return false;
+                }
+                var imports = importCollector.getDirectImports(resource);
+                return !imports.toUriSet().contains(candidateResourceUri);
+        }
+
         private static boolean oppositeShouldBeVisible(ReferenceDeclaration candidateReferenceDeclaration,
                                                                                                    ContentAssistContext context) {
                 var referenceDeclaration = EcoreUtil2.getContainerOfType(context.getCurrentModel(),
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 f64d4066..891c73c7 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
@@ -29,7 +29,7 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
         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 INDIVIDUAL_NODE_CLASS = "individual";
+        private static final String ATOM_NODE_CLASS = "atom";
         private static final String NEW_NODE_CLASS = "new";
 
         @Inject
@@ -99,7 +99,7 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
 
         protected String[] getHighlightClass(EObject eObject, EReference reference) {
                 boolean isError = ProblemUtil.isError(eObject);
-                if (ProblemUtil.isBuiltIn(eObject)) {
+                if (ProblemUtil.isBuiltIn(eObject) && !(eObject instanceof Problem)) {
                         var className = isError ? ERROR_CLASS : BUILTIN_CLASS;
                         return new String[]{className};
                 }
@@ -137,10 +137,10 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                 if (reference == ProblemPackage.Literals.VARIABLE_OR_NODE_EXPR__VARIABLE_OR_NODE) {
                         classesBuilder.add(NODE_CLASS);
                 }
-                if (ProblemUtil.isIndividualNode(node)) {
-                        classesBuilder.add(INDIVIDUAL_NODE_CLASS);
+                if (ProblemUtil.isAtomNode(node)) {
+                        classesBuilder.add(ATOM_NODE_CLASS);
                 }
-                if (ProblemUtil.isNewNode(node)) {
+                if (ProblemUtil.isMultiNode(node)) {
                         classesBuilder.add(NEW_NODE_CLASS);
                 }
         }
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 f75ecdb2..dd9f1053 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
@@ -11,10 +11,13 @@ import com.google.inject.Singleton;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.naming.IQualifiedNameProvider;
+import org.eclipse.xtext.resource.IResourceDescription;
 import org.eclipse.xtext.scoping.IScopeProvider;
+import org.eclipse.xtext.scoping.impl.GlobalResourceDescriptionProvider;
 import org.eclipse.xtext.util.IResourceScopeCache;
 import tools.refinery.language.model.problem.*;
 import tools.refinery.language.resource.ProblemResourceDescriptionStrategy;
+import tools.refinery.language.scoping.imports.ImportCollector;
 import tools.refinery.language.utils.ProblemUtil;
 
 import java.util.*;
@@ -36,6 +39,12 @@ public class TypeHashProvider {
         @Inject
         private IQualifiedNameConverter qualifiedNameConverter;
 
+        @Inject
+        private ImportCollector importCollector;
+
+        @Inject
+        private GlobalResourceDescriptionProvider globalResourceDescriptionProvider;
+
         public String getTypeHash(Relation relation) {
                 if (!(relation instanceof ClassDeclaration || relation instanceof EnumDeclaration) ||
                                 ProblemUtil.isBuiltIn(relation)) {
@@ -55,13 +64,15 @@ public class TypeHashProvider {
         }
 
         private Map<String, String> computeHashes(Problem problem) {
+                var resourceDescriptions = getResourceDescriptions(problem);
                 var qualifiedNameStrings = new TreeSet<String>();
-                var scope = scopeProvider.getScope(problem, ProblemPackage.Literals.ASSERTION__RELATION);
-                for (var description : scope.getAllElements()) {
-                        if (ProblemResourceDescriptionStrategy.COLOR_RELATION_TRUE.equals(
-                                        description.getUserData(ProblemResourceDescriptionStrategy.COLOR_RELATION))) {
-                                var qualifiedNameString = qualifiedNameConverter.toString(description.getQualifiedName());
-                                qualifiedNameStrings.add(qualifiedNameString);
+                for (var resourceDescription : resourceDescriptions) {
+                        for (var description : resourceDescription.getExportedObjectsByType(ProblemPackage.Literals.RELATION)) {
+                                if (ProblemResourceDescriptionStrategy.COLOR_RELATION_TRUE.equals(
+                                                description.getUserData(ProblemResourceDescriptionStrategy.COLOR_RELATION))) {
+                                        var qualifiedNameString = qualifiedNameConverter.toString(description.getQualifiedName());
+                                        qualifiedNameStrings.add(qualifiedNameString);
+                                }
                         }
                 }
                 var stringList = new ArrayList<>(qualifiedNameStrings);
@@ -90,4 +101,30 @@ public class TypeHashProvider {
                 }
                 return mapBuilder.build();
         }
+
+        private List<IResourceDescription> getResourceDescriptions(Problem problem) {
+                var resource = problem.eResource();
+                if (resource == null) {
+                        return List.of();
+                }
+                var resourceDescriptions = new ArrayList<IResourceDescription>();
+                var resourceDescription = globalResourceDescriptionProvider.getResourceDescription(resource);
+                if (resourceDescription != null) {
+                        resourceDescriptions.add(resourceDescription);
+                }
+                var resourceSet = resource.getResourceSet();
+                if (resourceSet != null) {
+                        for (var importedUri : importCollector.getAllImports(resource).toUriSet()) {
+                                var importedResource = resourceSet.getResource(importedUri, false);
+                                if (importedResource != null) {
+                                        var importedResourceDescription = globalResourceDescriptionProvider.getResourceDescription(
+                                                        importedResource);
+                                        if (importedResourceDescription != null) {
+                                                resourceDescriptions.add(importedResourceDescription);
+                                        }
+                                }
+                        }
+                }
+                return resourceDescriptions;
+        }
 }