1 files changed, 44 insertions, 23 deletions

diff --git a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java
index 229960a0..0067bf94 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java
@@ -1,47 +1,68 @@
 /*
- * 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
  */
 package tools.refinery.language.scoping;
 
-import java.util.List;
-
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.naming.IQualifiedNameProvider;
 import org.eclipse.xtext.naming.QualifiedName;
-import org.eclipse.xtext.resource.IResourceDescriptions;
 import org.eclipse.xtext.resource.IResourceDescriptionsProvider;
 import org.eclipse.xtext.resource.ISelectable;
-import org.eclipse.xtext.scoping.impl.ImportNormalizer;
-import org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider;
+import org.eclipse.xtext.scoping.IScope;
+import org.eclipse.xtext.scoping.impl.AbstractGlobalScopeDelegatingScopeProvider;
+import org.eclipse.xtext.util.IResourceScopeCache;
+import tools.refinery.language.naming.ProblemQualifiedNameProvider;
 
-import com.google.inject.Inject;
+public class ProblemLocalScopeProvider extends AbstractGlobalScopeDelegatingScopeProvider {
+        private static final String CACHE_KEY = "tools.refinery.language.scoping.ProblemLocalScopeProvider.CACHE_KEY";
 
-import tools.refinery.language.utils.ProblemUtil;
-
-public class ProblemLocalScopeProvider extends ImportedNamespaceAwareLocalScopeProvider {
-        private static final QualifiedName BUILTIN_LIBRARY_QUALIFIED_NAME = QualifiedName
-                        .create(ProblemUtil.BUILTIN_LIBRARY_NAME);
+        @Inject
+        @Named(ProblemQualifiedNameProvider.NAMED_DELEGATE)
+        private IQualifiedNameProvider delegateQualifiedNameProvider;
 
         @Inject
         private IResourceDescriptionsProvider resourceDescriptionsProvider;
 
-        @Override
-        protected List<ImportNormalizer> getImplicitImports(boolean ignoreCase) {
-                return List.of(doCreateImportNormalizer(BUILTIN_LIBRARY_QUALIFIED_NAME, true, ignoreCase));
-        }
+        @Inject
+        private IResourceScopeCache cache;
 
         @Override
-        protected List<ImportNormalizer> getImportedNamespaceResolvers(EObject context, boolean ignoreCase) {
-                return List.of();
+        public IScope getScope(EObject context, EReference reference) {
+                var resource = context.eResource();
+                if (resource == null) {
+                        return IScope.NULLSCOPE;
+                }
+                var globalScope = getGlobalScope(resource, reference);
+                var localImports = cache.get(CACHE_KEY, resource, () -> computeLocalImports(resource));
+                if (localImports == null) {
+                        return globalScope;
+                }
+                var type = reference.getEReferenceType();
+                boolean ignoreCase = isIgnoreCase(reference);
+                return ShadowingKeyAwareSelectableBasedScope.createScope(globalScope, localImports, type, ignoreCase);
         }
 
-        @Override
-        protected ISelectable internalGetAllDescriptions(Resource resource) {
+        protected ISelectable computeLocalImports(Resource resource) {
                 // Force the use of ProblemResourceDescriptionStrategy to include all QualifiedNames of objects.
-                IResourceDescriptions resourceDescriptions = resourceDescriptionsProvider
-                                .getResourceDescriptions(resource.getResourceSet());
-                return resourceDescriptions.getResourceDescription(resource.getURI());
+                var resourceDescriptions = resourceDescriptionsProvider.getResourceDescriptions(resource.getResourceSet());
+                var resourceDescription = resourceDescriptions.getResourceDescription(resource.getURI());
+                if (resourceDescription == null) {
+                        return null;
+                }
+                var rootElement = resource.getContents().getFirst();
+                if (rootElement == null) {
+                        return new NoFullyQualifiedNamesSelectable(resourceDescription);
+                }
+                var rootName = delegateQualifiedNameProvider.getFullyQualifiedName(rootElement);
+                if (rootName == null) {
+                        return new NoFullyQualifiedNamesSelectable(resourceDescription);
+                }
+                return new NormalizedSelectable(resourceDescription, rootName, QualifiedName.EMPTY);
         }
 }