1 files changed, 35 insertions, 9 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(),