Align signal_args with func_args.

Author: HolonProduction

gdtoolkit/formatter/expression_to_str.py

@@ -102,6 +102,7 @@ def expression_to_str(expression: Node) -> str:
         "enum_body": _enum_body_to_str,
         "enum_element": _enum_element_to_str,
         "signal_args": _args_to_str,
+        "signal_arg_regular": lambda e: e.children[0].value,
         "signal_arg_typed": lambda e: "{}: {}".format(
             e.children[0].value,
             e.children[1].value,

gdtoolkit/formatter/expression_utils.py

@@ -25,6 +25,7 @@ def is_foldable(expression: Node) -> bool:
             "string_name",
             "unique_node_path",
             "signal_arg_typed",
+            "signal_arg_regular",
             "non_foldable_dot_chain",
         ]
         and not expression.data.endswith("_pattern")

gdtoolkit/parser/gdscript.lark

@@ -29,7 +29,7 @@ enum_body: "{" [enum_element ("," enum_element)* [trailing_comma]] "}"
 enum_element: NAME ["=" type_cast]
 signal_stmt: "signal" NAME [signal_args]
 signal_args: "(" [signal_arg ("," signal_arg)* [trailing_comma]] ")"
-?signal_arg: NAME
+?signal_arg: NAME -> signal_arg_regular
            | NAME ":" TYPE_HINT -> signal_arg_typed
 extends_stmt: "extends" (NAME | string) ("." NAME)*
 classname_stmt: "class_name" NAME

tests/formatter/input-output-pairs/complex-signal-statements.in.gd

@@ -6,3 +6,4 @@ class X:
 	signal e(x,y:float)
 	signal f(x:int,aaaaaaaa, bbbbbbbbb, ccccccccc, dddddddd, eeeeeeee, ffffffff, ggggggggg, hhhhhhhh, iiiiiiii, jjjjjjjjjjj,y:float)
 	signal g(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx: int)
+	signal h(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)

tests/formatter/input-output-pairs/complex-signal-statements.out.gd

@@ -37,3 +37,6 @@ class X:
 	signal g(
 		xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx: int
 	)
+	signal h(
+		xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	)