add standalone-expression handling for inline-lambda multiline formatting, #154

Author: Scony

gdtoolkit/formatter/expression.py

@@ -161,6 +161,9 @@ def _format_foldable_to_multiple_lines(
         "lambda_header": _format_lambda_header_to_multiple_lines,
         "inline_lambda_statements": _format_inline_lambda_statements_to_multiple_lines,
         "return_stmt": _format_return_stmt_to_multiple_lines,
+        "expr_stmt": lambda e, ec, c: _format_standalone_expression(
+            e.children[0].children[0], ec, c
+        ),
     }  # type: Dict[str, Callable]
     return handlers[expression.data](expression, expression_context, context)
 

tests/formatter/input-output-pairs/long-inline-lambdas.in.gd

@@ -1,3 +1,5 @@
+func xyz(x):
+	pass
 func foo():
 	var x1 = func(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23): pass
 	var x2 = func(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23) -> int: pass
@@ -6,3 +8,4 @@ func foo():
 
 	var x5 = func baz(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23) -> int: pass;pass;return 123
 	var x6 = func baz(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23) -> int: pass;pass;return [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];pass
+	var x7 = func baz(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23) -> int: pass;pass;xyz([0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]);pass

tests/formatter/input-output-pairs/long-inline-lambdas.out.gd

@@ -1,3 +1,7 @@
+func xyz(x):
+	pass
+
+
 func foo():
 	var x1 = func(
 		p1,
@@ -190,3 +194,70 @@ func foo():
 		0,
 		0
 	] ; pass
+	var x7 = func baz(
+		p1,
+		p2,
+		p3,
+		p4,
+		p5,
+		p6,
+		p7,
+		p8,
+		p9,
+		p10,
+		p11,
+		p12,
+		p13,
+		p14,
+		p15,
+		p16,
+		p17,
+		p18,
+		p19,
+		p20,
+		p21,
+		p22,
+		p23
+	) -> int: pass ; pass ; xyz(
+		[
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0
+		]
+	) ; pass