Add temporary workaround for #192, #193

Author: Scony

gdtoolkit/formatter/expression.py

@@ -383,8 +383,23 @@ def _format_call_expression_to_multiple_lines(
 def _collapse_to_getattr_chain_and_format_to_multiple_lines(
     expression: Tree, expression_context: ExpressionContext, context: Context
 ) -> FormattedLines:
+    getattr_chain = _collapse_getattr_tree_to_getattr_chain(expression)
+    # TODO: remove once #193 implemented
+    getattr_chain_workaround = (
+        expression.data == "getattr_call"
+        and not is_expression_forcing_multiple_lines(
+            expression.children[0], context.standalone_comments
+        )
+        and isinstance(getattr_chain.children[0], Token)
+        and len(getattr_chain.children) == 3
+        and getattr_chain.children[2].data == "actual_getattr_call"
+    )
+    if getattr_chain_workaround:
+        return _format_call_expression_to_multiple_lines(
+            expression, expression_context, context
+        )
     return _format_foldable_to_multiple_lines(
-        _collapse_getattr_tree_to_getattr_chain(expression), expression_context, context
+        getattr_chain, expression_context, context
     )
 
 

tests/formatter/input-output-pairs/array-n-dict-expression-comments.out.gd

@@ -10,19 +10,16 @@ class X:
 		}  # r
 		var sut
 		var Config
-		(
-			sut
-			. init(
-				self,
-				{
-					0: "x",
-					1: "y",
-					2: "z",
-				},
-				{
-					Config.Household.LevelingDirection.POSITIVE: 0.1,  # 10%/s
-					Config.Household.LevelingDirection.NEGATIVE: 0.1,
-				}
-			)
+		sut.init(
+			self,
+			{
+				0: "x",
+				1: "y",
+				2: "z",
+			},
+			{
+				Config.Household.LevelingDirection.POSITIVE: 0.1,  # 10%/s
+				Config.Household.LevelingDirection.NEGATIVE: 0.1,
+			}
 		)
 		sut.process(10.0, 0)  # 0.0

tests/formatter/input-output-pairs/call-expressions.out.gd

@@ -87,7 +87,6 @@ class X:
 			1,
 			1,
 		)
-		var e = (
-			a
-			. f(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1)
+		var e = a.f(
+			1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
 		)

tests/formatter/input-output-pairs/getattr_chain_workaround_for_lack_of_193.in.gd

@@ -0,0 +1,23 @@
+var Logger = {}
+var registry = {}
+func _hash(_x):
+	pass
+func register(_x):
+	pass
+func _load_sprite_from_definition(def: Dictionary) -> void:
+	for group in def["Sprite"]:
+		var sprite = def["Sprite"][group]
+		for field in sprite:
+			match field:
+				"Hframes":
+					sprite["Hframes"] = int(sprite["Hframes"])
+				"Vframes":
+					sprite["Vframes"] = int(sprite["Vframes"])
+				_:
+					var defkey = _hash(sprite[field])
+					if not defkey in registry["Asset"]:
+						Logger.trace(0xf00003, "%s: Loading asset '%s'." % [def["DefKey"], sprite[field]])
+						register({"Schema": "Asset", "DefKey": defkey, "Path": sprite[field]})
+						sprite[field] = defkey
+					else:
+						Logger.trace(0xf00004, "%s: Asset already loaded '%s'." % [def["DefKey"], sprite[field]])

tests/formatter/input-output-pairs/getattr_chain_workaround_for_lack_of_193.out.gd

@@ -0,0 +1,34 @@
+var Logger = {}
+var registry = {}
+
+
+func _hash(_x):
+	pass
+
+
+func register(_x):
+	pass
+
+
+func _load_sprite_from_definition(def: Dictionary) -> void:
+	for group in def["Sprite"]:
+		var sprite = def["Sprite"][group]
+		for field in sprite:
+			match field:
+				"Hframes":
+					sprite["Hframes"] = int(sprite["Hframes"])
+				"Vframes":
+					sprite["Vframes"] = int(sprite["Vframes"])
+				_:
+					var defkey = _hash(sprite[field])
+					if not defkey in registry["Asset"]:
+						Logger.trace(
+							0xf00003, "%s: Loading asset '%s'." % [def["DefKey"], sprite[field]]
+						)
+						register({"Schema": "Asset", "DefKey": defkey, "Path": sprite[field]})
+						sprite[field] = defkey
+					else:
+						Logger.trace(
+							0xf00004,
+							"%s: Asset already loaded '%s'." % [def["DefKey"], sprite[field]]
+						)