cfengine format: Fixed issue with comments and end-of-promise semicolons

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>

Author: olehermanse

src/cfengine_cli/format.py

@@ -822,6 +822,10 @@ def _comment_indent(node: Node, indent: int) -> int:
     # content at the end of the previous sibling subtree, so that comments
     # appended after a class-guarded block visually belong to that block.
     if nearest is None:
+        # A comment between a promiser and its terminating ';' is a promise
+        # continuation — indent it past the promiser.
+        if node.parent and node.parent.type in {"promise", "half_promise"}:
+            return indent + 2
         prev = _skip_comments(node.prev_named_sibling, "prev")
         if prev and prev.type in INDENTED_TYPES:
             return _trailing_comment_indent(prev, indent)
@@ -905,6 +909,10 @@ def _autoformat(
     if node.type in {",", ";"}:
         if previous and previous.type == "macro":
             fmt.print(node, indent + 2)
+        elif previous and previous.type == "comment":
+            # A '#' comment runs to end of line, so a following ';'/',' can't
+            # share that line — put it on its own continuation line.
+            fmt.print(node, indent + 2)
         else:
             fmt.print_same_line(node)
     elif node.type == "comment":

tests/format/004_comments.expected.cf

@@ -151,3 +151,16 @@ bundle agent stigs
   vars:
     "foo" string => "bar";
 }
+
+bundle agent example_comment_before_semicolon
+{
+  files:
+    "affected object"
+      # ...details....
+      ;
+
+  processes:
+    "affected object"
+      # ...details....
+      ;
+}

tests/format/004_comments.input.cf

@@ -143,3 +143,14 @@ bundle agent stigs
   vars:
     "foo" string => "bar";
 }
+bundle agent example_comment_before_semicolon
+{
+  files:
+    "affected object"
+    # ...details....
+    ;
+  processes:
+    "affected object"
+    # ...details....
+    ;
+}