cfengine format: Fixed issue with multilining function calls inside macros

Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>

Author: olehermanse

src/cfengine_cli/format.py

@@ -256,8 +256,11 @@ def split_generic_list(
     # (one per branch); without, fix only the last non-comment element.
     if has_macros:
         for i, e in enumerate(elements):
-            if not e.lstrip().startswith(("@", "#")):
-                elements[i] = _set_trailing_comma(e, trailing_comma)
+            # Skip macros, comments, and the opening line of a wrapped element
+            # (e.g. "regcmp(") which is a continuation start, not a value.
+            if e.lstrip().startswith(("@", "#")) or e.rstrip().endswith(("(", "{")):
+                continue
+            elements[i] = _set_trailing_comma(e, trailing_comma)
     else:
         for i in reversed(range(len(elements))):
             if not elements[i].lstrip().startswith("#"):

tests/format/011_macros.expected.cf

@@ -200,3 +200,23 @@ bundle agent test(a)
     "$(a)";
 }
 @endif
+bundle agent test_macro_call_param
+{
+  classes:
+    "_control_agent_environment_vars_validated" -> { "CFE-3927" }
+      and => {
+        # The variable must be defined
+        isvariable("default:def.control_agent_environment_vars"),
+        # The length of the variable must be greater than 0 (can't be an empty list)
+        isgreaterthan(length("default:def.control_agent_environment_vars"), 0),
+        # Each element of the list must be of the form KEY=VALUE
+        every(".+=.+", "default:def.control_agent_environment_vars"),
+        # In 3.18 and greater we can validate the type of variable in use
+@if minimum_version(3.18.0)
+        regcmp(
+          "(policy slist|data array)",
+          type("default:def.control_agent_environment_vars", "true"),
+        ),
+@endif
+      };
+}

tests/format/011_macros.input.cf

@@ -193,3 +193,21 @@ reports:
 "$(a)";
 }
 @endif
+
+bundle agent test_macro_call_param
+{
+  classes:
+    "_control_agent_environment_vars_validated" -> { "CFE-3927" }
+      and => {
+        # The variable must be defined
+        isvariable("default:def.control_agent_environment_vars"),
+        # The length of the variable must be greater than 0 (can't be an empty list)
+        isgreaterthan(length("default:def.control_agent_environment_vars"), 0),
+        # Each element of the list must be of the form KEY=VALUE
+        every(".+=.+", "default:def.control_agent_environment_vars"),
+        # In 3.18 and greater we can validate the type of variable in use
+@if minimum_version(3.18.0)
+        regcmp( "(policy slist|data array)", type( "default:def.control_agent_environment_vars", "true" ) ),
+@endif
+      };
+}