2 files changed, 25 insertions, 1 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 fa04a012..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
@@ -24,6 +24,7 @@ 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;
@@ -44,6 +45,9 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider
         @Inject
         private ProblemDesugarer desugarer;
 
+        @Inject
+        private ImportCollector importCollector;
+
         @Override
         protected Iterable<IEObjectDescription> queryScope(IScope scope, CrossReference crossReference,
                                                                                                            ContentAssistContext context) {
@@ -110,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) &&
@@ -127,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/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
index 7d90ea00..3080a78e 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
@@ -42,6 +42,7 @@ public class ProblemResourceDescriptionStrategy extends DefaultResourceDescripti
         public static final String PREFERRED_NAME_TRUE = "true";
         public static final String IMPORTS = DATA_PREFIX + "IMPORTS";
         public static final String IMPORTS_SEPARATOR = "|";
+        public static final String MODULE_KIND = DATA_PREFIX + "MODULE_KIND";
         public static final String COLOR_RELATION = DATA_PREFIX + "COLOR_RELATION";
         public static final String COLOR_RELATION_TRUE = "true";
 
@@ -135,13 +136,14 @@ public class ProblemResourceDescriptionStrategy extends DefaultResourceDescripti
 
         protected Map<String, String> getUserData(EObject eObject) {
                 var builder = ImmutableMap.<String, String>builder();
-                if (eObject instanceof Problem) {
+                if (eObject instanceof Problem problem) {
                         builder.put(SHADOWING_KEY, SHADOWING_KEY_PROBLEM);
                         var explicitImports = importCollector.getDirectImports(eObject.eResource());
                         var importsString = explicitImports.toList().stream()
                                         .map(importEntry -> importEntry.uri().toString())
                                         .collect(Collectors.joining(IMPORTS_SEPARATOR));
                         builder.put(IMPORTS, importsString);
+                        builder.put(MODULE_KIND, problem.getKind().getName());
                 } else if (eObject instanceof Node) {
                         builder.put(SHADOWING_KEY, SHADOWING_KEY_NODE);
                 } else if (eObject instanceof Relation relation) {