Fix multiline parenthesized expression spacing and indentation in some

continuation expressions

Close #224

Author: NathanLovato

queries/gdscript.scm

@@ -223,9 +223,18 @@
 
 (parenthesized_expression "(" @append_antispace)
 (parenthesized_expression
- "(" @append_input_softline @append_indent_start
- ")" @prepend_input_softline @prepend_indent_end
+ "(" @append_input_softline @append_indent_start @append_indent_start
+ ")" @prepend_input_softline @prepend_indent_end @prepend_indent_end
  (#multi_line_only!))
+(parenthesized_expression ")" @prepend_antispace (#multi_line_only!))
+
+; Remove the space added by binary operators when a multiline parenthesized
+; expression closes immediately after them, as in:
+; if (a or
+;     b):
+(parenthesized_expression
+    (binary_operator) . ")" @prepend_antispace
+    (#multi_line_only!))
 
 ; LAMBDA
 (lambda ":" @append_space (#single_line_only!))

tests/expected/issue_224.gd

@@ -0,0 +1,35 @@
+# This copies code provided by @twilit-jack in
+# https://github.com/GDQuest/GDScript-formatter/issues/224 (Thanks!)
+# The issue compiled multiple cases combined here.
+func _test() -> void:
+	var my_very_long_condition := true
+	var my_other_very_long_condition := false
+
+	if (my_very_long_condition
+			or my_other_very_long_condition):
+		pass
+
+	if (
+			my_very_long_condition
+			or my_other_very_long_condition
+	):
+		pass
+
+	var party = [
+		"Godot",
+		"Godette",
+		"Steve",
+	]
+
+	var character_dict = {
+		"Name": "Bob",
+		"Age": 27,
+		"Job": "Mechanic",
+	}
+
+	enum Tile {
+		BRICK,
+		FLOOR,
+		SPIKE,
+		TELEPORT,
+	}

tests/expected/lambda_ternary_multiline.gd

@@ -1,4 +1,4 @@
 var my_callable: Callable = (
-	(func():
-		my_var = 1)
-	if some_condition else some_function )
+		(func():
+			my_var = 1)
+		if some_condition else some_function)

tests/expected/multiline.gd

@@ -1,31 +1,31 @@
 func foo():
 	var angle_degrees = 135
 	var quadrant = (
-		"northeast" if angle_degrees <= 90
-		else "southeast" if angle_degrees <= 180
-		else "southwest" if angle_degrees <= 270
-		else "northwest"
+			"northeast" if angle_degrees <= 90
+			else "southeast" if angle_degrees <= 180
+			else "southwest" if angle_degrees <= 270
+			else "northwest"
 	)
 
 	var quadrant_newlines = (
-		"northeast"
-		if angle_degrees <= 90
-		else "southeast"
-		if angle_degrees <= 180
-		else "southwest"
-		if angle_degrees <= 270
-		else "northwest"
+			"northeast"
+			if angle_degrees <= 90
+			else "southeast"
+			if angle_degrees <= 180
+			else "southwest"
+			if angle_degrees <= 270
+			else "northwest"
 	)
 
 	var position = Vector2(250, 350)
 	if (
-		position.x > 200 and position.x < 400
-		and position.y > 300 and position.y < 400
+			position.x > 200 and position.x < 400
+			and position.y > 300 and position.y < 400
 	):
 		pass
 
 	var a = (
-		1 + 2
+			1 + 2
 	)
 
 	var a = [
@@ -38,10 +38,10 @@ func foo():
 	]
 
 	var sum = (1 +
-		2
+			2
 	)
 
 	var bitflags = (
-		0x0b
-		| 0xa0
+			0x0b
+			| 0xa0
 	)

tests/input/issue_224.gd

@@ -0,0 +1,35 @@
+# This copies code provided by @twilit-jack in
+# https://github.com/GDQuest/GDScript-formatter/issues/224 (Thanks!)
+# The issue compiled multiple cases combined here.
+func _test() -> void:
+	var my_very_long_condition := true
+	var my_other_very_long_condition := false
+
+	if (my_very_long_condition
+			or my_other_very_long_condition):
+		pass
+
+	if (
+			my_very_long_condition
+			or my_other_very_long_condition
+	):
+		pass
+
+	var party = [
+		"Godot",
+		"Godette",
+		"Steve",
+	]
+
+	var character_dict = {
+		"Name": "Bob",
+		"Age": 27,
+		"Job": "Mechanic",
+	}
+
+	enum Tile {
+		BRICK,
+		FLOOR,
+		SPIKE,
+		TELEPORT,
+	}