cfengine format: Made sure trailing commas are always added when multilining

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>

Author: olehermanse

src/cfengine_cli/format.py

@@ -188,6 +188,9 @@ def split_generic_list(middle: list[Node], indent: int, line_length: int) -> lis
             lines = split_generic_value(element, indent, line_length)
             elements.append(" " * indent + lines[0])
             elements.extend(lines[1:])
+    # Always add a trailing comma on multi-line lists
+    if elements and not elements[-1].endswith(","):
+        elements[-1] = elements[-1] + ","
     return elements
 
 

tests/format/003_wrapping.input.cf

@@ -26,7 +26,7 @@ slist => {
 };
 "variable_name"
 slist => {
-"one","two","three","four","five","six","seven","eight","ten","eleven",
+"one","two","three","four","five","six","seven","eight","ten","eleven"
 };
 }
 
@@ -39,7 +39,7 @@ vars:
 "one", "two", "three", "four", "five", "six", "seven", "eight"
 );
 "variable_name" string => concat(
-"one","two","three","four","five","six","seven","eight","nine","ten",
+"one","two","three","four","five","six","seven","eight","nine","ten"
 );
 }
 
@@ -61,6 +61,6 @@ concat("two", "three", "four", "five", "six", "seven", "eight", "nine", ""),
 );
 "variable_name" string => concat(
 "one",
-concat("two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", ),
+concat("two", "three", "four", "five", "six", "seven", "eight", "nine", "ten"),
 );
 }

tests/unit/test_format.py

@@ -301,7 +301,7 @@ def test_stringify_single_line_node_with_children():
 def test_split_generic_list_basic():
     nodes = [_leaf("string", '"a"'), _leaf(","), _leaf("string", '"b"')]
     result = split_generic_list(nodes, 4, 80)
-    assert result == ['    "a",', '    "b"']
+    assert result == ['    "a",', '    "b",']
 
 
 def test_maybe_split_generic_list_fits():