Merge pull request #1932 from lf-lang/fix-exception-in-diagrams

Fix IllegalArgumentException in diagram synthesis
lf-lang · Aug 4, 2023 · bcba4c7 · bcba4c7
2 parents 081351e + e5ed19d
commit bcba4c7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/cli/lff/src/main/java/org/lflang/cli/Lff.java b/cli/lff/src/main/java/org/lflang/cli/Lff.java
@@ -12,6 +12,7 @@
 import org.lflang.ast.FormattingUtil;
 import org.lflang.ast.IsEqual;
 import org.lflang.ast.LfParsingHelper;
+import org.lflang.lf.Model;
 import org.lflang.util.FileUtil;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -175,7 +176,7 @@ private void formatSingleFile(Path path, Path inputRoot, Path outputRoot) {
     }
 
     final String formattedFileContents =
-        FormattingUtil.render(resource.getContents().get(0), lineLength);
+        FormattingUtil.render((Model) resource.getContents().get(0), lineLength);
     if (!new IsEqual(resource.getContents().get(0))
         .doSwitch(
             new LfParsingHelper()

diff --git a/core/src/main/java/org/lflang/ast/FormattingUtil.java b/core/src/main/java/org/lflang/ast/FormattingUtil.java
@@ -42,7 +42,7 @@ public class FormattingUtil {
   static final long BADNESS_PER_NEWLINE = 1;
 
   /** Return a String representation of {@code object}, with lines wrapped at {@code lineLength}. */
-  public static String render(EObject object, int lineLength) {
+  public static String render(Model object, int lineLength) {
     return render(object, lineLength, inferTarget(object), false);
   }
 
@@ -89,7 +89,7 @@ private static Target inferTarget(EObject object) {
   }
 
   /** Return a String representation of {@code object} using a reasonable default line length. */
-  public static String render(EObject object) {
+  public static String render(Model object) {
     return render(object, DEFAULT_LINE_LENGTH);
   }
 

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/core/src/main/java/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -98,7 +98,7 @@
 import org.lflang.AttributeUtils;
 import org.lflang.InferredType;
 import org.lflang.ast.ASTUtils;
-import org.lflang.ast.FormattingUtil;
+import org.lflang.ast.ToLf;
 import org.lflang.diagram.synthesis.action.CollapseAllReactorsAction;
 import org.lflang.diagram.synthesis.action.ExpandAllReactorsAction;
 import org.lflang.diagram.synthesis.action.FilterCycleAction;
@@ -1481,7 +1481,7 @@ private String createParameterLabel(ParameterInstance param) {
     if (param.getOverride() != null) {
       b.append(" = ");
       var init = param.getActualValue();
-      b.append(FormattingUtil.render(init));
+      b.append(ToLf.instance.doSwitch(init));
     }
     return b.toString();
   }
@@ -1512,7 +1512,7 @@ private String createStateVariableLabel(StateVar variable) {
       b.append(":").append(t.toOriginalText());
     }
     if (variable.getInit() != null) {
-      b.append(FormattingUtil.render(variable.getInit()));
+      b.append(ToLf.instance.doSwitch(variable.getInit()));
     }
     return b.toString();
   }

diff --git a/core/src/main/java/org/lflang/formatting2/LFFormatter.java b/core/src/main/java/org/lflang/formatting2/LFFormatter.java
@@ -17,6 +17,7 @@
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.lflang.ast.FormattingUtil;
+import org.lflang.lf.Model;
 
 public class LFFormatter implements IFormatter2 {
 
@@ -40,6 +41,6 @@ public List<ITextReplacement> format(FormatterRequest request) {
             request.getTextRegionAccess(),
             documentRegion.getOffset(),
             documentRegion.getLength(),
-            FormattingUtil.render(documentContents.get(0))));
+            FormattingUtil.render((Model) documentContents.get(0))));
   }
 }