fix unique node paths handling, fixes #178

Author: Scony

gdtoolkit/formatter/expression_to_str.py

@@ -77,6 +77,9 @@ def expression_to_str(expression: Node) -> str:
         "get_node": lambda e: f"${expression_to_str(e.children[0])}",
         "path": lambda e: "".join([name_token.value for name_token in e.children]),
         "node_path": lambda e: f"^{expression_to_str(e.children[0])}",
+        "unique_node_path": lambda e: "".join(
+            [expression_to_str(n) for n in e.children]
+        ),
         "string_name": lambda e: f"&{expression_to_str(e.children[0])}",
         # fake expressions:
         "func_args": _args_to_str,

gdtoolkit/formatter/expression_utils.py

@@ -22,6 +22,7 @@ def is_foldable(expression: Node) -> bool:
             "get_node",
             "node_path",
             "string_name",
+            "unique_node_path",
         ]
         and not expression.data.endswith("_pattern")
     )

gdtoolkit/parser/gdscript.lark

@@ -233,10 +233,12 @@ _simple_lambda_stmt: single_lambda_stmt (";" single_lambda_stmt)* [";"]
         | get_node
         | "^" string -> node_path
         | "&" string -> string_name
+        | unique_node_path
 HEX.2: /-?0x[a-fA-F0-9][a-fA-F0-9_]*/
 BIN.2: /-?0b[01][01_]*/
-get_node: "$" (path | string)
-!path: ["%"] NAME ("/" NAME)*
+get_node: "$" (path | string | unique_node_path)
+!path: NAME ("/" NAME)*
+!unique_node_path: "%" path
 array: "[" [type_cast ("," type_cast)* [trailing_comma]] "]"
 trailing_comma: ","
 dict: "{" [c_dict_element ("," c_dict_element)* [trailing_comma]] "}"

tests/formatter/input-output-pairs/long-atom-expressions.in.gd

@@ -1,4 +1,6 @@
+extends Node
 func foo():
 	# TODO: consider adding fake parenthesis
 	var cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc = ^"../Some/Stuff"
 	var dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd = &"xxx"
+	var cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc = %UniqueNodeName/Xyz

tests/formatter/input-output-pairs/long-atom-expressions.out.gd

@@ -1,4 +1,8 @@
+extends Node
+
+
 func foo():
 	# TODO: consider adding fake parenthesis
 	var cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc = ^"../Some/Stuff"
 	var dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd = &"xxx"
+	var cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc = %UniqueNodeName/Xyz

tests/formatter/input-output-pairs/simple-atom-expressions.in.gd

@@ -19,3 +19,5 @@ func foo():
 	var e = &"xxx"
 	var xa=$%UniqueNodeName
 	var xb=$%UniqueNodeName/Xyz
+	var xc=%UniqueNodeName
+	var xd=%UniqueNodeName/Xyz

tests/formatter/input-output-pairs/simple-atom-expressions.out.gd

@@ -20,3 +20,5 @@ func foo():
 	var e = &"xxx"
 	var xa = $%UniqueNodeName
 	var xb = $%UniqueNodeName/Xyz
+	var xc = %UniqueNodeName
+	var xd = %UniqueNodeName/Xyz

tests/valid-gd-scripts/unique_node_name.gd

@@ -2,3 +2,4 @@ extends Node
 
 func foo():
 	var x = $%UniqueNodeName
+	var y = %UniqueNodeName