Merge pull request #48 from kris7t/validator

Improve content assist and validator

2 files changed, 8 insertions, 6 deletions

diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java
index b3c58366..ecaa7e0d 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java
@@ -63,6 +63,8 @@ public class ModelInitializer {
 
         private final Map<PartialRelation, RelationInfo> partialRelationInfoMap = new HashMap<>();
 
+        private final Set<PartialRelation> targetTypes = new HashSet<>();
+
         private final MetamodelBuilder metamodelBuilder = Metamodel.builder();
 
         private Metamodel metamodel;
@@ -285,6 +287,7 @@ public class ModelInitializer {
                 var relation = getPartialRelation(referenceDeclaration);
                 var source = getPartialRelation(classDeclaration);
                 var target = getPartialRelation(referenceDeclaration.getReferenceType());
+                targetTypes.add(target);
                 boolean containment = referenceDeclaration.getKind() == ReferenceKind.CONTAINMENT;
                 var opposite = referenceDeclaration.getOpposite();
                 PartialRelation oppositeRelation = null;
@@ -473,17 +476,16 @@ public class ModelInitializer {
         private void collectPredicateDefinition(PredicateDefinition predicateDefinition, ModelStoreBuilder storeBuilder) {
                 var partialRelation = getPartialRelation(predicateDefinition);
                 var query = toQuery(partialRelation.name(), predicateDefinition);
-                boolean mutable;
+                boolean mutable = targetTypes.contains(partialRelation);
                 TruthValue defaultValue;
                 if (predicateDefinition.isError()) {
-                        mutable = false;
                         defaultValue = TruthValue.FALSE;
                 } else {
                         var seed = modelSeed.getSeed(partialRelation);
                         defaultValue = seed.reducedValue() == TruthValue.FALSE ? TruthValue.FALSE : TruthValue.UNKNOWN;
                         var cursor = seed.getCursor(defaultValue, problemTrace.getNodeTrace().size());
                         // The symbol should be mutable if there is at least one non-default entry in the seed.
-                        mutable = cursor.move();
+                        mutable = mutable || cursor.move();
                 }
                 var translator = new PredicateTranslator(partialRelation, query, mutable, defaultValue);
                 storeBuilder.with(translator);
diff --git a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/ModelGenerationTest.java b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/ModelGenerationTest.java
index 899e3cb3..b4abce81 100644
--- a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/ModelGenerationTest.java
+++ b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/ModelGenerationTest.java
@@ -77,7 +77,7 @@ class ModelGenerationTest {
                                 % Scope
                                 scope Post = 5, Person = 5.
                                 """);
-                assertThat(parsedProblem.errors(), empty());
+                assertThat(parsedProblem.getResourceErrors(), empty());
                 var problem = parsedProblem.problem();
 
                 var storeBuilder = ModelStore.builder()
@@ -211,7 +211,7 @@ class ModelGenerationTest {
 
                                 scope node = 200..210, Region = 10..*, Choice = 1..*, Statechart = 1.
                                 """);
-                assertThat(parsedProblem.errors(), empty());
+                assertThat(parsedProblem.getResourceErrors(), empty());
                 var problem = parsedProblem.problem();
 
                 var storeBuilder = ModelStore.builder()
@@ -278,7 +278,7 @@ class ModelGenerationTest {
 
                                 scope Filesystem += 0, Entry = 100.
                                 """);
-                assertThat(parsedProblem.errors(), empty());
+                assertThat(parsedProblem.getResourceErrors(), empty());
                 var problem = parsedProblem.problem();
 
                 var storeBuilder = ModelStore.builder()