More tinkering with comments around Code eObjects.

lf-lang · Jun 14, 2023 · 438faf2 · 438faf2
1 parent 7c50334
commit 438faf2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/core/src/main/java/org/lflang/ast/ToLf.java b/core/src/main/java/org/lflang/ast/ToLf.java
@@ -206,9 +206,9 @@ private static List<INode> getContainedComments(INode node) {
           && (child.getText().contains("\n") || child.getText().contains("\r"))
           && !inSemanticallyInsignificantLeadingRubbish) {
         break;
-      } else if (child instanceof ICompositeNode compositeNode
-          && compositeNode.getGrammarElement().eContainer() instanceof ParserRuleImpl pri
-          && pri.getName().equals("Body")) {
+      } else if (child.getParent() != null
+          && child.getParent().getGrammarElement().eContainer() instanceof ParserRuleImpl pri
+          && pri.getName().equals("Body") && !child.getText().isBlank()) {
         break;
       }
     }

diff --git a/core/src/main/java/org/lflang/ast/ToText.java b/core/src/main/java/org/lflang/ast/ToText.java
@@ -49,16 +49,19 @@ public String caseCode(Code code) {
       StringBuilder builder = new StringBuilder(Math.max(node.getTotalLength(), 1));
       boolean started = false;
       for (ILeafNode leaf : node.getLeafNodes()) {
-        if (!leaf.getText().contains("{=")
-            && (leaf.getText().contains("\n") && !ASTUtils.isComment(leaf))) {
-          started = true;
+        if (!leaf.getText().equals("{=") && !leaf.getText().equals("=}")) {
+          var nothing = leaf.getText().isBlank() || ASTUtils.isComment(leaf);
+          if (!nothing || started || leaf.getText().startsWith("\n"))
+            builder.append(leaf.getText());
+          if ((leaf.getText().contains("\n") || (!nothing))) {
+            started = true;
+          }
         }
-        if (started && !leaf.getText().contains("=}")) builder.append(leaf.getText());
       }
-      String str = builder.toString().trim();
-      if (str.split("\n").length > 1) {
+      String str = builder.toString();
+      if (str.contains("\n")) {
         // multi line code
-        return StringUtil.trimCodeBlock(str, 1);
+        return StringUtil.trimCodeBlock(str, 0);
       } else {
         // single line code
         return str.trim();