refactor: simplify module name inference

We never need to infer names for modules not added by import, because importing
a problem (i.e., a Resource manually added into the ResourceSet) is not allowed.

4 files changed, 4 insertions, 164 deletions

diff --git a/subprojects/language/src/main/java/tools/refinery/language/library/ClasspathBasedLibrary.java b/subprojects/language/src/main/java/tools/refinery/language/library/ClasspathBasedLibrary.java
index 4b748c64..bc9ae5ca 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/library/ClasspathBasedLibrary.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/library/ClasspathBasedLibrary.java
@@ -14,21 +14,10 @@ import java.util.*;
 public abstract class ClasspathBasedLibrary implements RefineryLibrary {
         private final QualifiedName prefix;
         private final List<QualifiedName> automaticImports;
-        private final URI rootUri;
 
         protected ClasspathBasedLibrary(QualifiedName prefix, List<QualifiedName> automaticImports) {
                 this.prefix = prefix;
                 this.automaticImports = List.copyOf(automaticImports);
-                var context = this.getClass();
-                var contextPath = context.getCanonicalName().replace('.', '/') + ".class";
-                var contextResource = context.getClassLoader().getResource(contextPath);
-                if (contextResource == null) {
-                        throw new IllegalStateException("Failed to find library context");
-                }
-                var contextUri = URI.createURI(contextResource.toString());
-                var segments = Arrays.copyOf(contextUri.segments(), contextUri.segmentCount() - 1);
-                rootUri = URI.createHierarchicalURI(contextUri.scheme(), contextUri.authority(), contextUri.device(),
-                                segments, null, null);
         }
 
         protected ClasspathBasedLibrary(QualifiedName prefix) {
@@ -48,43 +37,6 @@ public abstract class ClasspathBasedLibrary implements RefineryLibrary {
                 return Optional.empty();
         }
 
-        @Override
-        public Optional<QualifiedName> getQualifiedName(URI uri, List<Path> libraryPaths) {
-                if (!uri.isHierarchical() ||
-                                !Objects.equals(rootUri.scheme(), uri.scheme()) ||
-                                !Objects.equals(rootUri.authority(), uri.authority()) ||
-                                !Objects.equals(rootUri.device(), uri.device()) ||
-                                rootUri.segmentCount() >= uri.segmentCount()) {
-                        return Optional.empty();
-                }
-                int rootSegmentCount = rootUri.segmentCount();
-                int uriSegmentCount = uri.segmentCount();
-                if (!uri.segment(uriSegmentCount - 1).endsWith(RefineryLibrary.EXTENSION)) {
-                        return Optional.empty();
-                }
-                var segments = new ArrayList<String>();
-                int i = 0;
-                while (i < rootSegmentCount) {
-                        if (!rootUri.segment(i).equals(uri.segment(i))) {
-                                return Optional.empty();
-                        }
-                        i++;
-                }
-                while (i < uriSegmentCount) {
-                        var segment = uri.segment(i);
-                        if (i == uriSegmentCount - 1) {
-                                segment = segment.substring(0, segment.length() - RefineryLibrary.EXTENSION.length());
-                        }
-                        segments.add(segment);
-                        i++;
-                }
-                var qualifiedName = QualifiedName.create(segments);
-                if (!qualifiedName.startsWith(prefix)) {
-                        return Optional.empty();
-                }
-                return Optional.of(qualifiedName);
-        }
-
         public static Optional<URI> getLibraryUri(Class<?> context, QualifiedName qualifiedName) {
                 var packagePath = context.getPackageName().replace('.', '/');
                 var libraryPath = String.join("/", qualifiedName.getSegments());
diff --git a/subprojects/language/src/main/java/tools/refinery/language/library/PathLibrary.java b/subprojects/language/src/main/java/tools/refinery/language/library/PathLibrary.java
index c6f994df..6f418492 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/library/PathLibrary.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/library/PathLibrary.java
@@ -10,7 +10,6 @@ import org.eclipse.xtext.naming.QualifiedName;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -54,37 +53,4 @@ public final class PathLibrary implements RefineryLibrary {
                 }
         return Path.of(first, rest);
         }
-
-        @Override
-        public Optional<QualifiedName> getQualifiedName(URI uri, List<Path> libraryPaths) {
-                if (libraryPaths.isEmpty()) {
-                        return Optional.empty();
-                }
-                if (!uri.isFile() || !uri.hasAbsolutePath()) {
-                        return Optional.empty();
-                }
-                var path = Path.of(uri.toFileString());
-                for (var library : libraryPaths) {
-                        if (path.startsWith(library)) {
-                                return getRelativeQualifiedName(library, path);
-                        }
-                }
-                return Optional.empty();
-        }
-
-        private static Optional<QualifiedName> getRelativeQualifiedName(Path library, Path path) {
-                var relativePath = path.relativize(library);
-                var segments = new ArrayList<String>();
-                for (Path value : relativePath) {
-                        segments.add(value.toString());
-                }
-                int lastIndex = segments.size() - 1;
-                var lastSegment = segments.get(lastIndex);
-                if (!lastSegment.endsWith(EXTENSION)) {
-                        return Optional.empty();
-                }
-                lastSegment = lastSegment.substring(0, lastSegment.length() - RefineryLibrary.EXTENSION.length());
-                segments.set(lastIndex, lastSegment);
-                return Optional.of(QualifiedName.create(segments));
-        }
 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/library/RefineryLibrary.java b/subprojects/language/src/main/java/tools/refinery/language/library/RefineryLibrary.java
index e1f8d7bc..9c0d72f9 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/library/RefineryLibrary.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/library/RefineryLibrary.java
@@ -20,6 +20,4 @@ public interface RefineryLibrary {
         }
 
         Optional<URI> resolveQualifiedName(QualifiedName qualifiedName, List<Path> libraryPaths);
-
-        Optional<QualifiedName> getQualifiedName(URI uri, List<Path> libraryPaths);
 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/scoping/imports/ImportAdapter.java b/subprojects/language/src/main/java/tools/refinery/language/scoping/imports/ImportAdapter.java
index 5a8f7fd7..a34c09cc 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/scoping/imports/ImportAdapter.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/scoping/imports/ImportAdapter.java
@@ -8,12 +8,9 @@ package tools.refinery.language.scoping.imports;
 import com.google.common.base.Splitter;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import org.apache.log4j.Logger;
-import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.naming.QualifiedName;
@@ -24,7 +21,6 @@ import java.nio.file.Path;
 import java.util.*;
 
 public class ImportAdapter extends AdapterImpl {
-        private static final Logger LOG = Logger.getLogger(ImportAdapter.class);
         private static final List<RefineryLibrary> DEFAULT_LIBRARIES;
         private static final List<Path> DEFAULT_PATHS;
 
@@ -53,12 +49,9 @@ public class ImportAdapter extends AdapterImpl {
         private final Map<QualifiedName, URI> qualifiedNameToUriMap = new LinkedHashMap<>();
         private final Map<URI, QualifiedName> uriToQualifiedNameMap = new LinkedHashMap<>();
 
-        private ImportAdapter(ResourceSet resourceSet) {
+        private ImportAdapter() {
                 libraries = new ArrayList<>(DEFAULT_LIBRARIES);
                 libraryPaths = new ArrayList<>(DEFAULT_PATHS);
-                for (var resource : resourceSet.getResources()) {
-                        resourceAdded(resource);
-                }
         }
 
         @Override
@@ -120,81 +113,10 @@ public class ImportAdapter extends AdapterImpl {
                 return uriToQualifiedNameMap.get(uri);
         }
 
-        @Override
-        public void notifyChanged(Notification msg) {
-                switch (msg.getEventType()) {
-                case Notification.ADD -> {
-                        if (msg.getNewValue() instanceof Resource resource) {
-                                resourceAdded(resource);
-                        }
-                }
-                case Notification.ADD_MANY -> {
-                        if (msg.getNewValue() instanceof List<?> list) {
-                                manyResourcesAdded(list);
-                        }
-                }
-                case Notification.REMOVE -> {
-                        if (msg.getOldValue() instanceof Resource resource) {
-                                resourceRemoved(resource);
-                        }
-                }
-                case Notification.REMOVE_MANY -> {
-                        if (msg.getOldValue() instanceof List<?> list) {
-                                manyResourcesRemoved(list);
-                        }
-                }
-                default -> {
-                        // Nothing to update.
-                }
-                }
-        }
-
-        private void manyResourcesAdded(List<?> list) {
-                for (var element : list) {
-                        if (element instanceof Resource resource) {
-                                resourceAdded(resource);
-                        }
-                }
-        }
-
-        private void manyResourcesRemoved(List<?> list) {
-                for (var element : list) {
-                        if (element instanceof Resource resource) {
-                                resourceRemoved(resource);
-                        }
-                }
-        }
-
-        private void resourceAdded(Resource resource) {
-                var uri = resource.getURI();
-                for (var library : libraries) {
-                        var result = library.getQualifiedName(uri, libraryPaths);
-                        if (result.isPresent()) {
-                                var qualifiedName = result.get();
-                                var previousQualifiedName = uriToQualifiedNameMap.putIfAbsent(uri, qualifiedName);
-                                if (previousQualifiedName == null) {
-                                        if (qualifiedNameToUriMap.put(qualifiedName, uri) != null) {
-                                                throw new IllegalArgumentException("Duplicate resource for" + qualifiedName);
-                                        }
-                                } else if (!previousQualifiedName.equals(qualifiedName)) {
-                                        LOG.warn("Expected %s to have qualified name %s, got %s instead".formatted(
-                                                        uri, previousQualifiedName, qualifiedName));
-                                }
-                        }
-                }
-        }
-
-        private void resourceRemoved(Resource resource) {
-                var qualifiedName = uriToQualifiedNameMap.remove(resource.getURI());
-                if (qualifiedName != null) {
-                        qualifiedNameToUriMap.remove(qualifiedName);
-                }
-        }
-
         public static ImportAdapter getOrInstall(ResourceSet resourceSet) {
                 var adapter = getAdapter(resourceSet);
                 if (adapter == null) {
-                        adapter = new ImportAdapter(resourceSet);
+                        adapter = new ImportAdapter();
                         resourceSet.eAdapters().add(adapter);
                 }
                 return adapter;
@@ -226,5 +148,7 @@ public class ImportAdapter extends AdapterImpl {
                 newAdapter.libraries.addAll(originalAdapter.libraries);
                 newAdapter.libraryPaths.clear();
                 newAdapter.libraryPaths.addAll(originalAdapter.libraryPaths);
+                newAdapter.uriToQualifiedNameMap.putAll(originalAdapter.uriToQualifiedNameMap);
+                newAdapter.qualifiedNameToUriMap.putAll(originalAdapter.qualifiedNameToUriMap);
         }
 }