1 files changed, 47 insertions, 4 deletions

diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SemanticsUtils.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SemanticsUtils.java
index b72ba697..9c40e6df 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SemanticsUtils.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SemanticsUtils.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -7,15 +7,20 @@ package tools.refinery.language.semantics;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.naming.IQualifiedNameProvider;
 import org.eclipse.xtext.naming.QualifiedName;
+import org.eclipse.xtext.resource.IEObjectDescription;
+import org.eclipse.xtext.resource.IResourceDescriptionsProvider;
 import org.eclipse.xtext.scoping.IScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.naming.ProblemQualifiedNameProvider;
 
 import java.util.Optional;
 
@@ -25,10 +30,17 @@ public class SemanticsUtils {
         private IQualifiedNameProvider qualifiedNameProvider;
 
         @Inject
+        @Named(ProblemQualifiedNameProvider.NAMED_DELEGATE)
+        private IQualifiedNameProvider delegateQualifiedNameProvider;
+
+        @Inject
         private IQualifiedNameConverter qualifiedNameConverter;
 
-        public Optional<String> getName(EObject eObject) {
-                var qualifiedName = qualifiedNameProvider.getFullyQualifiedName(eObject);
+        @Inject
+        private IResourceDescriptionsProvider resourceDescriptionsProvider;
+
+        public Optional<String> getNameWithoutRootPrefix(EObject eObject) {
+                var qualifiedName = delegateQualifiedNameProvider.getFullyQualifiedName(eObject);
                 if (qualifiedName == null) {
                         return Optional.empty();
                 }
@@ -36,11 +48,31 @@ public class SemanticsUtils {
         }
 
         @Nullable
+        public <T> T maybeGetLocalElement(Problem problem, QualifiedName qualifiedName, Class<T> type, EClass eClass) {
+                var resource = problem.eResource();
+                var resourceSet = resource.getResourceSet();
+                var resourceDescriptions = resourceDescriptionsProvider.getResourceDescriptions(resourceSet);
+                var resourceDescription = resourceDescriptions.getResourceDescription(resource.getURI());
+                if (resourceDescription == null) {
+                        return null;
+                }
+                var eObjectDescriptions = resourceDescription.getExportedObjects(eClass, qualifiedName, false);
+                return maybeGet(problem, eObjectDescriptions, qualifiedName, type);
+        }
+
+        @Nullable
         public <T> T maybeGetElement(Problem problem, IScope scope, QualifiedName qualifiedName, Class<T> type) {
                 if (qualifiedName == null) {
                         throw new IllegalArgumentException("Element name must not be null");
                 }
-                var iterator = scope.getElements(qualifiedName).iterator();
+                var eObjectDescriptions = scope.getElements(qualifiedName);
+                return maybeGet(problem, eObjectDescriptions, qualifiedName, type);
+        }
+
+        @Nullable
+        private <T> T maybeGet(Problem problem, Iterable<IEObjectDescription> eObjectDescriptions,
+                                                   QualifiedName qualifiedName, Class<T> type) {
+                var iterator = eObjectDescriptions.iterator();
                 if (!iterator.hasNext()) {
                         return null;
                 }
@@ -60,8 +92,19 @@ public class SemanticsUtils {
         }
 
         @NotNull
+        public <T> T getLocalElement(Problem problem, QualifiedName qualifiedName, Class<T> type, EClass eClass) {
+                var element = maybeGetLocalElement(problem, qualifiedName, type, eClass);
+                return getOrThrow(element, qualifiedName, type);
+        }
+
+        @NotNull
         public <T> T getElement(Problem problem, IScope scope, QualifiedName qualifiedName, Class<T> type) {
                 var element = maybeGetElement(problem, scope, qualifiedName, type);
+                return getOrThrow(element, qualifiedName, type);
+        }
+
+        @NotNull
+        private <T> T getOrThrow(@Nullable T element, QualifiedName qualifiedName, Class<T> type) {
                 if (element == null) {
                         var qualifiedNameString = qualifiedNameConverter.toString(qualifiedName);
                         throw new IllegalArgumentException("No such %s: %s"