feat: solution serializer

2 files changed, 17 insertions, 5 deletions

diff --git a/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java b/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java
index 55a5ac20..770a1a19 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java
@@ -75,6 +75,16 @@ public class ProblemFormatter extends AbstractJavaFormatter {
                 }
         }
 
+        protected void format(EnumDeclaration enumDeclaration, IFormattableDocument doc) {
+                surroundNewLines(doc, enumDeclaration, this::twoNewLines);
+                var region = regionFor(enumDeclaration);
+                doc.append(region.keyword("enum"), this::oneSpace);
+                doc.prepend(region.keyword("{"), this::oneSpace);
+                doc.append(region.keyword("{"), it -> it.setNewLines(1, 1, 2));
+                doc.prepend(region.keyword("}"), it -> it.setNewLines(1, 1, 2));
+                doc.prepend(region.keyword("."), this::noSpace);
+        }
+
         protected void format(PredicateDefinition predicateDefinition, IFormattableDocument doc) {
                 surroundNewLines(doc, predicateDefinition, this::twoNewLines);
                 var region = regionFor(predicateDefinition);
@@ -151,14 +161,14 @@ public class ProblemFormatter extends AbstractJavaFormatter {
         }
 
         protected void surroundNewLines(IFormattableDocument doc, EObject eObject,
-                        Procedure1<? super IHiddenRegionFormatter> init) {
+                                                                        Procedure1<? super IHiddenRegionFormatter> init) {
                 var region = doc.getRequest().getTextRegionAccess().regionForEObject(eObject);
                 preprendNewLines(doc, region, init);
                 appendNewLines(doc, region, init);
         }
 
         protected void preprendNewLines(IFormattableDocument doc, ISequentialRegion region,
-                        Procedure1<? super IHiddenRegionFormatter> init) {
+                                                                        Procedure1<? super IHiddenRegionFormatter> init) {
                 if (region == null) {
                         return;
                 }
@@ -174,7 +184,7 @@ public class ProblemFormatter extends AbstractJavaFormatter {
         }
 
         protected void appendNewLines(IFormattableDocument doc, ISequentialRegion region,
-                        Procedure1<? super IHiddenRegionFormatter> init) {
+                                                                  Procedure1<? super IHiddenRegionFormatter> init) {
                 if (region == null) {
                         return;
                 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/serializer/PreferShortAssertionsProblemSemanticSequencer.java b/subprojects/language/src/main/java/tools/refinery/language/serializer/PreferShortAssertionsProblemSemanticSequencer.java
index b9cafbc2..3432b2d8 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/serializer/PreferShortAssertionsProblemSemanticSequencer.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/serializer/PreferShortAssertionsProblemSemanticSequencer.java
@@ -21,8 +21,7 @@ public class PreferShortAssertionsProblemSemanticSequencer extends ProblemSemant
 
         @Override
         protected void sequence_Assertion(ISerializationContext context, Assertion semanticObject) {
-                if (semanticObject.isDefault() ||
-                                !(semanticObject.getValue() instanceof LogicConstant logicConstant) ||
+                if (!(semanticObject.getValue() instanceof LogicConstant logicConstant) ||
                                 logicConstant.getLogicValue() == LogicValue.ERROR) {
                         super.sequence_Assertion(context, semanticObject);
                         return;
@@ -39,6 +38,9 @@ public class PreferShortAssertionsProblemSemanticSequencer extends ProblemSemant
                 }
                 var feeder = createSequencerFeeder(context, semanticObject);
                 var access = grammarAccess.getAssertionAccess();
+                if (semanticObject.isDefault()) {
+                        feeder.accept(access.getDefaultDefaultKeyword_0_0());
+                }
                 feeder.accept(access.getValueShortLogicConstantParserRuleCall_1_1_0_0(), logicConstant);
                 feeder.accept(access.getRelationRelationQualifiedNameParserRuleCall_1_1_1_0_1(), semanticObject.getRelation());
                 var iterator = semanticObject.getArguments().iterator();