feat(language): automatic problem kind inference

10 files changed, 160 insertions, 28 deletions

diff --git a/subprojects/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 b/subprojects/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
index 863e55d4..46ac18fe 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
+++ b/subprojects/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
@@ -51,7 +51,7 @@ Workflow {
 
                 language = StandardLanguage {
                         name = 'tools.refinery.language.Problem'
-                        fileExtensions = 'refinery,problem'
+                        fileExtensions = 'problem,refinery'
                         referencedResource = 'platform:/resource/tools.refinery.refinery-language-model/model/problem.genmodel'
                         serializer = {
                                 generateStub = false
diff --git a/subprojects/language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java b/subprojects/language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java
index a846e265..f9a564b0 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java
@@ -15,7 +15,9 @@ import org.eclipse.xtext.conversion.IValueConverterService;
 import org.eclipse.xtext.linking.ILinkingService;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.naming.IQualifiedNameProvider;
+import org.eclipse.xtext.parser.IAstFactory;
 import org.eclipse.xtext.parser.IParser;
+import org.eclipse.xtext.parsetree.reconstr.ITransientValueService;
 import org.eclipse.xtext.resource.*;
 import org.eclipse.xtext.scoping.IGlobalScopeProvider;
 import org.eclipse.xtext.scoping.IScopeProvider;
@@ -30,13 +32,18 @@ import tools.refinery.language.linking.ProblemLinkingService;
 import tools.refinery.language.naming.ProblemDelegateQualifiedNameProvider;
 import tools.refinery.language.naming.ProblemQualifiedNameConverter;
 import tools.refinery.language.naming.ProblemQualifiedNameProvider;
+import tools.refinery.language.parser.ProblemEcoreElementFactory;
 import tools.refinery.language.parser.antlr.TokenSourceInjectingProblemParser;
-import tools.refinery.language.resource.*;
+import tools.refinery.language.resource.ProblemLocationInFileProvider;
+import tools.refinery.language.resource.ProblemResource;
+import tools.refinery.language.resource.ProblemResourceDescriptionManager;
+import tools.refinery.language.resource.ProblemResourceDescriptionStrategy;
 import tools.refinery.language.resource.state.ProblemDerivedStateComputer;
 import tools.refinery.language.scoping.ProblemGlobalScopeProvider;
 import tools.refinery.language.scoping.ProblemLocalScopeProvider;
 import tools.refinery.language.serializer.PreferShortAssertionsProblemSemanticSequencer;
 import tools.refinery.language.serializer.ProblemCrossReferenceSerializer;
+import tools.refinery.language.serializer.ProblemTransientValueService;
 import tools.refinery.language.validation.ProblemDiagnosticConverter;
 
 /**
@@ -51,6 +58,11 @@ public class ProblemRuntimeModule extends AbstractProblemRuntimeModule {
                 return TokenSourceInjectingProblemParser.class;
         }
 
+        @Override
+        public Class<? extends IAstFactory> bindIAstFactory() {
+                return ProblemEcoreElementFactory.class;
+        }
+
         public Class<? extends IQualifiedNameConverter> bindIQualifiedNameConverter() {
                 return ProblemQualifiedNameConverter.class;
         }
@@ -116,6 +128,11 @@ public class ProblemRuntimeModule extends AbstractProblemRuntimeModule {
         }
 
         @Override
+        public Class<? extends ITransientValueService> bindITransientValueService() {
+                return ProblemTransientValueService.class;
+        }
+
+        @Override
         public Class<? extends ISemanticSequencer> bindISemanticSequencer() {
                 return PreferShortAssertionsProblemSemanticSequencer.class;
         }
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..3a9bb920 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
@@ -59,7 +59,7 @@ public abstract class ClasspathBasedLibrary implements RefineryLibrary {
                 }
                 int rootSegmentCount = rootUri.segmentCount();
                 int uriSegmentCount = uri.segmentCount();
-                if (!uri.segment(uriSegmentCount - 1).endsWith(RefineryLibrary.EXTENSION)) {
+                if (!uri.segment(uriSegmentCount - 1).endsWith(RefineryLibrary.FILE_NAME_SUFFIX)) {
                         return Optional.empty();
                 }
                 var segments = new ArrayList<String>();
@@ -73,7 +73,7 @@ public abstract class ClasspathBasedLibrary implements RefineryLibrary {
                 while (i < uriSegmentCount) {
                         var segment = uri.segment(i);
                         if (i == uriSegmentCount - 1) {
-                                segment = segment.substring(0, segment.length() - RefineryLibrary.EXTENSION.length());
+                                segment = segment.substring(0, segment.length() - RefineryLibrary.FILE_NAME_SUFFIX.length());
                         }
                         segments.add(segment);
                         i++;
@@ -88,7 +88,7 @@ public abstract class ClasspathBasedLibrary implements RefineryLibrary {
         public static Optional<URI> getLibraryUri(Class<?> context, QualifiedName qualifiedName) {
                 var packagePath = context.getPackageName().replace('.', '/');
                 var libraryPath = String.join("/", qualifiedName.getSegments());
-                var resourceName = "%s/%s%s".formatted(packagePath, libraryPath, RefineryLibrary.EXTENSION);
+                var resourceName = "%s/%s%s".formatted(packagePath, libraryPath, RefineryLibrary.FILE_NAME_SUFFIX);
                 var resource = context.getClassLoader().getResource(resourceName);
                 if (resource == null) {
                         return Optional.empty();
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..8eaf8458 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
@@ -41,7 +41,7 @@ public final class PathLibrary implements RefineryLibrary {
                 for (var i = 0; i < segmentCount; i++) {
                         var segment = qualifiedName.getSegment(i);
                         if (i == segmentCount - 1) {
-                                segment = segment + RefineryLibrary.EXTENSION;
+                                segment = segment + RefineryLibrary.FILE_NAME_SUFFIX;
                         }
                         if (i == 0) {
                                 first = segment;
@@ -80,10 +80,10 @@ public final class PathLibrary implements RefineryLibrary {
                 }
                 int lastIndex = segments.size() - 1;
                 var lastSegment = segments.get(lastIndex);
-                if (!lastSegment.endsWith(EXTENSION)) {
+                if (!lastSegment.endsWith(FILE_NAME_SUFFIX)) {
                         return Optional.empty();
                 }
-                lastSegment = lastSegment.substring(0, lastSegment.length() - RefineryLibrary.EXTENSION.length());
+                lastSegment = lastSegment.substring(0, lastSegment.length() - RefineryLibrary.FILE_NAME_SUFFIX.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..2559749a 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
@@ -7,13 +7,14 @@ package tools.refinery.language.library;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.xtext.naming.QualifiedName;
+import tools.refinery.language.utils.ProblemUtil;
 
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
 
 public interface RefineryLibrary {
-        String EXTENSION = ".refinery";
+        String FILE_NAME_SUFFIX = "." + ProblemUtil.MODULE_EXTENSION;
 
         default List<QualifiedName> getAutomaticImports() {
                 return List.of();
diff --git a/subprojects/language/src/main/java/tools/refinery/language/parser/ProblemEcoreElementFactory.java b/subprojects/language/src/main/java/tools/refinery/language/parser/ProblemEcoreElementFactory.java
new file mode 100644
index 00000000..b54c6970
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/parser/ProblemEcoreElementFactory.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.parser;
+
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.xtext.conversion.ValueConverterException;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.parser.DefaultEcoreElementFactory;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemPackage;
+
+public class ProblemEcoreElementFactory extends DefaultEcoreElementFactory {
+        @Override
+        public void set(
+                        EObject object, String feature, Object value, String ruleName, INode node) throws ValueConverterException {
+                super.set(object, feature, value, ruleName, node);
+                if (object instanceof Problem problem && ProblemPackage.Literals.PROBLEM__KIND.getName().equals(feature)) {
+                        ExplicitAssignmentTracker.install(problem);
+                }
+        }
+
+        public static boolean hasExplicitlySetProblemKind(Problem problem) {
+                return ExplicitAssignmentTracker.hasAdapter(problem);
+        }
+
+        private static class ExplicitAssignmentTracker extends AdapterImpl {
+                @Override
+                public boolean isAdapterForType(Object type) {
+                        return type == ExplicitAssignmentTracker.class;
+                }
+
+                public static boolean hasAdapter(Problem problem) {
+                        return EcoreUtil.getAdapter(problem.eAdapters(), ExplicitAssignmentTracker.class) != null;
+                }
+
+                public static void install(Problem problem) {
+                        if (hasAdapter(problem)) {
+                                throw new IllegalStateException("Duplicate explicit assignment of module kind");
+                        }
+                        problem.eAdapters().add(new ExplicitAssignmentTracker());
+                }
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResource.java b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResource.java
index 43239ffe..57b7bb45 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResource.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResource.java
@@ -20,9 +20,13 @@ import org.eclipse.xtext.linking.impl.IllegalNodeException;
 import org.eclipse.xtext.linking.impl.XtextLinkingDiagnostic;
 import org.eclipse.xtext.linking.lazy.LazyLinkingResource;
 import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.parser.IParseResult;
 import org.eclipse.xtext.resource.DerivedStateAwareResource;
 import org.eclipse.xtext.util.Triple;
 import org.jetbrains.annotations.Nullable;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.parser.ProblemEcoreElementFactory;
+import tools.refinery.language.utils.ProblemUtil;
 
 import java.util.Arrays;
 import java.util.List;
@@ -40,6 +44,26 @@ public class ProblemResource extends DerivedStateAwareResource {
          */
         private int cyclicLinkingDetectionCounter = 0;
 
+        @Override
+        protected void updateInternalState(IParseResult oldParseResult, IParseResult newParseResult) {
+                if (isNewRootElement(oldParseResult, newParseResult) &&
+                                newParseResult.getRootASTElement() instanceof Problem newRootProblem &&
+                                !ProblemEcoreElementFactory.hasExplicitlySetProblemKind(newRootProblem)) {
+                        var defaultModuleKind = ProblemUtil.getDefaultModuleKind(getURI());
+                        newRootProblem.setKind(defaultModuleKind);
+                }
+                super.updateInternalState(oldParseResult, newParseResult);
+        }
+
+        private boolean isNewRootElement(IParseResult oldParseResult, IParseResult newParseResult) {
+                if (oldParseResult == null) {
+                        return true;
+                }
+                var oldRootAstElement = oldParseResult.getRootASTElement();
+                var newRootAstElement = newParseResult.getRootASTElement();
+                return oldRootAstElement != newRootAstElement;
+        }
+
         /**
          * Tries to resolve a reference and emits a diagnostic if the reference is unresolvable or ambiguous.
          * <p>
diff --git a/subprojects/language/src/main/java/tools/refinery/language/scoping/imports/ImportCollector.java b/subprojects/language/src/main/java/tools/refinery/language/scoping/imports/ImportCollector.java
index 6cdfa63e..fc4ca43c 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/scoping/imports/ImportCollector.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/scoping/imports/ImportCollector.java
@@ -11,6 +11,7 @@ import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.linking.impl.LinkingHelper;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
@@ -57,16 +58,10 @@ public class ImportCollector {
                 if (resourceSet == null) {
                         return ImportCollection.EMPTY;
                 }
-                Map<QualifiedName, Set<QualifiedName>> aliasesMap = new LinkedHashMap<>();
-                for (var statement : problem.getStatements()) {
-                        if (statement instanceof ImportStatement importStatement) {
-                                collectImportStatement(importStatement, aliasesMap);
-                        }
-                }
                 var adapter = ImportAdapter.getOrInstall(resourceSet);
                 var collection = new ImportCollection();
                 collectAutomaticImports(collection, adapter);
-                collectExplicitImports(aliasesMap, collection, adapter);
+                collectExplicitImports(problem, collection, adapter);
                 collection.remove(resource.getURI());
                 return collection;
         }
@@ -82,25 +77,30 @@ public class ImportCollector {
                 }
         }
 
-        private void collectExplicitImports(Map<QualifiedName, Set<QualifiedName>> aliasesMap,
-                                                                                ImportCollection collection, ImportAdapter adapter) {
-                for (var entry : aliasesMap.entrySet()) {
-                        var qualifiedName = entry.getKey();
-                        var uri = adapter.resolveQualifiedName(qualifiedName);
-                        if (uri != null) {
-                                var aliases = entry.getValue();
-                                collection.add(NamedImport.explicit(uri, qualifiedName, List.copyOf(aliases)));
+        private void collectExplicitImports(Problem problem, ImportCollection collection, ImportAdapter adapter) {
+                for (var statement : problem.getStatements()) {
+                        if (statement instanceof ImportStatement importStatement) {
+                                collectImportStatement(importStatement, collection, adapter);
                         }
                 }
         }
 
-        private void collectImportStatement(ImportStatement importStatement,
-                                                                                Map<QualifiedName, Set<QualifiedName>> aliasesMap) {
+        private void collectImportStatement(ImportStatement importStatement, ImportCollection collection,
+                                                                                ImportAdapter adapter) {
                 var nodes = NodeModelUtils.findNodesForFeature(importStatement,
                                 ProblemPackage.Literals.IMPORT_STATEMENT__IMPORTED_MODULE);
                 var aliasString = importStatement.getAlias();
                 var alias = Strings.isNullOrEmpty(aliasString) ? QualifiedName.EMPTY :
                                 NamingUtil.stripRootPrefix(qualifiedNameConverter.toQualifiedName(aliasString));
+                var referredProblem = (EObject) importStatement.eGet(ProblemPackage.Literals.IMPORT_STATEMENT__IMPORTED_MODULE,
+                                false);
+                URI referencedUri = null;
+                if (referredProblem != null && !referredProblem.eIsProxy()) {
+                        var resource = referredProblem.eResource();
+                        if (resource != null) {
+                                referencedUri = resource.getURI();
+                        }
+                }
                 for (var node : nodes) {
                         var qualifiedNameString = linkingHelper.getCrossRefNodeAsString(node, true);
                         if (Strings.isNullOrEmpty(qualifiedNameString)) {
@@ -108,8 +108,10 @@ public class ImportCollector {
                         }
                         var qualifiedName = NamingUtil.stripRootPrefix(
                                         qualifiedNameConverter.toQualifiedName(qualifiedNameString));
-                        var aliases = aliasesMap.computeIfAbsent(qualifiedName, ignored -> new LinkedHashSet<>());
-                        aliases.add(alias);
+                        var uri = referencedUri == null ? adapter.resolveQualifiedName(qualifiedName) : referencedUri;
+                        if (uri != null) {
+                                collection.add(NamedImport.explicit(uri, qualifiedName, List.of(alias)));
+                        }
                 }
         }
 
diff --git a/subprojects/language/src/main/java/tools/refinery/language/serializer/ProblemTransientValueService.java b/subprojects/language/src/main/java/tools/refinery/language/serializer/ProblemTransientValueService.java
new file mode 100644
index 00000000..c364b30b
--- /dev/null
+++ b/subprojects/language/src/main/java/tools/refinery/language/serializer/ProblemTransientValueService.java
@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.serializer;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.xtext.parsetree.reconstr.impl.DefaultTransientValueService;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.parser.ProblemEcoreElementFactory;
+import tools.refinery.language.utils.ProblemUtil;
+
+public class ProblemTransientValueService extends DefaultTransientValueService {
+        @Override
+        public boolean isTransient(EObject owner, EStructuralFeature feature, int index) {
+                if (owner instanceof Problem problem && feature == ProblemPackage.Literals.PROBLEM__KIND) {
+                        return problem.getName() == null && problem.getKind() == ProblemUtil.getDefaultModuleKind(problem) &&
+                                        !ProblemEcoreElementFactory.hasExplicitlySetProblemKind(problem);
+                }
+                return super.isTransient(owner, feature, index);
+        }
+}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
index 6b48cb5a..f70893e0 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
@@ -5,6 +5,7 @@
  */
 package tools.refinery.language.utils;
 
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.EcoreUtil2;
@@ -12,6 +13,8 @@ import tools.refinery.language.library.BuiltinLibrary;
 import tools.refinery.language.model.problem.*;
 
 public final class ProblemUtil {
+        public static final String MODULE_EXTENSION = "refinery";
+
         private ProblemUtil() {
                 throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
         }
@@ -124,6 +127,18 @@ public final class ProblemUtil {
                 };
         }
 
+        public static ModuleKind getDefaultModuleKind(Problem problem) {
+                var resource = problem.eResource();
+                if (resource == null) {
+                        return ModuleKind.PROBLEM;
+                }
+                return getDefaultModuleKind(resource.getURI());
+        }
+
+        public static ModuleKind getDefaultModuleKind(URI uri) {
+                return MODULE_EXTENSION.equals(uri.fileExtension()) ? ModuleKind.MODULE : ModuleKind.PROBLEM;
+        }
+
         public static boolean isModule(Problem problem) {
                 return problem.getKind() == ModuleKind.MODULE;
         }