Format Java.

lf-lang · Jun 16, 2023 · fd198c1 · fd198c1
1 parent d969c2b
commit fd198c1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/core/src/main/java/org/lflang/ast/MalleableString.java b/core/src/main/java/org/lflang/ast/MalleableString.java
@@ -585,7 +585,7 @@ private Leaf(String[] possibilities) {
     }
 
     private Leaf(String possibility) {
-      this.possibilities = new String[]{possibility};
+      this.possibilities = new String[] {possibility};
     }
 
     @Override

diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -489,7 +489,8 @@ public MalleableString caseStateVar(StateVar object) {
     }
     msb.append("state ").append(object.getName());
     msb.append(typeAnnotationFor(object.getType()));
-    if (object.getInit() != null) msb.append(doSwitch(object.getInit()).transform(ToLf::whitespaceInitializer));
+    if (object.getInit() != null)
+      msb.append(doSwitch(object.getInit()).transform(ToLf::whitespaceInitializer));
 
     return msb.get();
   }
@@ -945,9 +946,16 @@ public MalleableString caseParameter(Parameter object) {
         .get();
   }
 
-  /** Ensure that equals signs are surrounded by spaces if neither the text before nor the text after has spaces and is not a string. */
-  private static Function<String, String> conditionalWhitespaceInitializer(MalleableString before, MalleableString after) {
-    return it -> before.isEmpty() && !(after.toString().contains(" ") || after.toString().startsWith("\"")) ? it : whitespaceInitializer(it);
+  /**
+   * Ensure that equals signs are surrounded by spaces if neither the text before nor the text after
+   * has spaces and is not a string.
+   */
+  private static Function<String, String> conditionalWhitespaceInitializer(
+      MalleableString before, MalleableString after) {
+    return it ->
+        before.isEmpty() && !(after.toString().contains(" ") || after.toString().startsWith("\""))
+            ? it
+            : whitespaceInitializer(it);
   }
 
   /** Ensure that equals signs are surrounded by spaces. */
@@ -1073,7 +1081,15 @@ private MalleableString list(
                 })
             .collect(new Joiner(separator, prefix, suffix));
     if (whitespaceRigid) return rigid;
-    var rigidList = list(separator.strip() + "\n", "", suffixSameLine ? "" : "\n", nothingIfEmpty, true, suffixSameLine, items);
+    var rigidList =
+        list(
+            separator.strip() + "\n",
+            "",
+            suffixSameLine ? "" : "\n",
+            nothingIfEmpty,
+            true,
+            suffixSameLine,
+            items);
     return MalleableString.anyOf(
         rigid,
         new Builder()