Add support for multiline neg/bitw_not/attr/call/array/dict patterns, closes Scony#46

Author: Scony

gdtoolkit/formatter/expression.py

@@ -209,6 +209,13 @@ def _format_foldable_to_multiple_lines(
  "shift_pattern": _format_operator_chain_based_expression_to_multiple_lines,
  "arith_pattern": _format_operator_chain_based_expression_to_multiple_lines,
  "mdr_pattern": _format_operator_chain_based_expression_to_multiple_lines,
+ "neg_pattern": _format_concrete_expression_to_single_line,
+ "bitw_not_pattern": _format_concrete_expression_to_single_line,
+ "attr_pattern": _format_operator_chain_based_expression_to_multiple_lines,
+ "call_pattern": _format_call_expression_to_multiple_lines,
+ "array_pattern": _format_concrete_expression_to_single_line,
+ "dict_pattern": _format_concrete_expression_to_single_line,
+ "kv_pair_pattern": _format_kv_pair_to_multiple_lines,
  } # type: Dict[str, Callable]
  return handlers[expression.data](expression, expression_context, context)
 
@@ -254,7 +261,7 @@ def _format_args_to_multiple_lines(
 def _format_kv_pair_to_multiple_lines(
  expression: Tree, expression_context: ExpressionContext, context: Context
 ) -> FormattedLines:
- suffix = ":" if expression.data == "c_dict_element" else " ="
+ suffix = ":" if expression.data in ["c_dict_element", "kv_pair_pattern"] else " ="
  key_expression_context = ExpressionContext(
  expression_context.prefix_string,
  expression_context.prefix_line,

gdtoolkit/formatter/expression_utils.py

@@ -24,6 +24,9 @@ def is_foldable(expression: Node) -> bool:
  "signal_arg_typed",
  "signal_arg_regular",
  "non_foldable_dot_chain",
+ "var_capture_pattern",
+ "etc_pattern",
+ "wildcard_pattern",
  ]
 
 

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

@@ -25,3 +25,19 @@ class X:
 pass
 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1:
 pass
+-------------------------------------------------------------------------------------------1:
+pass
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~1:
+pass
+x.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa.aaaa:
+pass
+Vector3(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+1+1+1+1+1+1+1+1+1+1+1+1+1,1):
+pass
+var xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:
+pass
+# TODO: format to multiple lines once multiline syntax is fixed in Godot
+[_,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,1,1,1,1,1,1,1,1,1,1,1,1,1]:
+pass
+# TODO: format to multiple lines once multiline syntax is fixed in Godot
+{'aaaaa', 'bbbbbbbbbbbbbbbbbbbbb': 1111, 'ccccccccccccccccccccc': 1111, 'ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd': 1111}:
+pass

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

@@ -214,3 +214,41 @@ class X:
 * 1
 ):
 pass
+-------------------------------------------------------------------------------------------1:
+pass
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~1:
+pass
+(
+x
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+. aaaa
+):
+pass
+Vector3(
+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 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1, 1
+):
+pass
+var xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:
+pass
+# TODO: format to multiple lines once multiline syntax is fixed in Godot
+[_, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]:
+pass
+# TODO: format to multiple lines once multiline syntax is fixed in Godot
+{"aaaaa", "bbbbbbbbbbbbbbbbbbbbb": 1111, "ccccccccccccccccccccc": 1111, "ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd": 1111}:
+pass