From 89b8200f403fcd1364bbcc8ae4cf80597b8243b1 Mon Sep 17 00:00:00 2001
From: Pawel Lampe <pawel.lampe@gmail.com>
Date: Sun, 15 Sep 2024 12:44:19 +0200
Subject: [PATCH] Add more 'complex_multistatement_lambdas' tests & perform
 some test gardening

---
 .../complex_multistatement_lambdas.in.gd      | 168 +++++-
 .../complex_multistatement_lambdas.out.gd     | 204 ++++++-
 .../inline_lambdas_w_comments.out.gd          |  95 ++--
 .../long_inline_lambdas.in.gd                 |  16 -
 .../long_inline_lambdas.out.gd                | 508 ------------------
 tests/formatter/test_input_output_pairs.py    |   2 +-
 6 files changed, 421 insertions(+), 572 deletions(-)
 delete mode 100644 tests/formatter/input-output-pairs/long_inline_lambdas.in.gd
 delete mode 100644 tests/formatter/input-output-pairs/long_inline_lambdas.out.gd

diff --git a/tests/formatter/input-output-pairs/complex_multistatement_lambdas.in.gd b/tests/formatter/input-output-pairs/complex_multistatement_lambdas.in.gd
index 40018c60..4f9490b9 100644
--- a/tests/formatter/input-output-pairs/complex_multistatement_lambdas.in.gd
+++ b/tests/formatter/input-output-pairs/complex_multistatement_lambdas.in.gd
@@ -2,7 +2,7 @@ func foo(x):
 	pass
 func bar(x,y):
 	pass
-func baz():
+func actual_params():
 	foo(func():
 		var x = 1
 		return x)
@@ -53,3 +53,169 @@ func baz():
 		func():
 			var y = 1
 			return y)
+
+func arrays():
+	var x1 = [func():
+		var x = 1
+		return x]
+	var x2 = [func():
+		var x = 1
+		return x
+	]
+	var x3 = [func():
+		var x = 1
+		return x,func():
+			var x = 1
+			return x
+	]
+	var x4 = [func():
+		var x = 1
+		return x,
+		func():
+			var x = 1
+			return x
+	]
+	var x5 = [func():
+		var x = 1
+		return x,
+
+		func():
+			var x = 1
+			return x
+	]
+	var x6 = [func():
+		var x = 1
+		if x > 0:
+			print(x),
+		func():
+			var x = 1
+			return x
+	]
+	var x7 = [func():
+		var x = 1
+		if x > 0:
+			print(x),
+
+		func():
+			var x = 1
+			return x
+	]
+
+func dicts():
+	var x1 = {'a':func():
+		var x = 1
+		return x}
+	var x2 = {'a':func():
+		var x = 1
+		return x
+	}
+	var x3 = {'a':func():
+		var x = 1
+		return x,'b':func():
+			var x = 1
+			return x
+	}
+	var x4 = {'a':func():
+		var x = 1
+		return x,
+		'b':func():
+			var x = 1
+			return x
+	}
+	var x5 = {'a':func():
+		var x = 1
+		return x,'b':
+			func():
+				var x = 1
+				return x
+	}
+	var x6 = {'a':func():
+		var x = 1
+		return x,
+
+		'b':func():
+			var x = 1
+			return x
+	}
+	var x7 = {'a':func():
+		var x = 1
+		if x > 0:
+			print(x),'b':func():
+			var x = 1
+			return x
+	}
+	var x8 = {'a':func():
+		var x = 1
+		if x > 0:
+			print(x),
+		'b':func():
+			var x = 1
+			return x
+	}
+	var x9 = {'a':func():
+		var x = 1
+		if x > 0:
+			print(x),
+
+		'b':func():
+			var x = 1
+			return x
+	}
+
+func nested():
+	var x1 = func():
+		var x1r = func():
+			var x = 1
+			return x
+		return x1r
+
+	var x2 = func():
+		var x2r = func():
+			pass
+			pass
+		pass
+
+	var x3 = func():
+		var x3r = func():
+			var x3rr = func():
+				pass
+				pass
+			pass
+		pass
+
+	var x4 = func():
+		if true:
+			var x4r = func():
+				pass
+				pass
+			pass
+		pass
+
+	var x5 = func():
+		if true:
+			var x5r = func():
+				if true:
+					pass
+					pass
+				pass
+			pass
+		pass
+
+	var x6 = func():
+		if true:
+			var x6r = func():
+				if true:
+					var x6rr = func():
+						pass
+						pass
+					pass
+				pass
+			pass
+		pass
+
+	# TODO: fix
+	# var x7 = [func():
+	# 	pass
+	# 	var x = func():
+	# 		pass
+	# 		pass,]
diff --git a/tests/formatter/input-output-pairs/complex_multistatement_lambdas.out.gd b/tests/formatter/input-output-pairs/complex_multistatement_lambdas.out.gd
index 6201bb28..324f52ed 100644
--- a/tests/formatter/input-output-pairs/complex_multistatement_lambdas.out.gd
+++ b/tests/formatter/input-output-pairs/complex_multistatement_lambdas.out.gd
@@ -6,7 +6,7 @@ func bar(x, y):
 	pass
 
 
-func baz():
+func actual_params():
 	foo(
 		func():
 			var x = 1
@@ -73,3 +73,205 @@ func baz():
 			var y = 1
 			return y
 	)
+
+
+func arrays():
+	var x1 = [
+		func():
+			var x = 1
+			return x
+	]
+	var x2 = [
+		func():
+			var x = 1
+			return x
+	]
+	var x3 = [
+		func():
+			var x = 1
+			return x,
+		func():
+			var x = 1
+			return x
+	]
+	var x4 = [
+		func():
+			var x = 1
+			return x,
+		func():
+			var x = 1
+			return x
+	]
+	var x5 = [
+		func():
+			var x = 1
+			return x,
+		func():
+			var x = 1
+			return x
+	]
+	var x6 = [
+		func():
+			var x = 1
+			if x > 0:
+				print(x),
+		func():
+			var x = 1
+			return x
+	]
+	var x7 = [
+		func():
+			var x = 1
+			if x > 0:
+				print(x),
+		func():
+			var x = 1
+			return x
+	]
+
+
+func dicts():
+	var x1 = {
+		"a":
+		func():
+			var x = 1
+			return x
+	}
+	var x2 = {
+		"a":
+		func():
+			var x = 1
+			return x
+	}
+	var x3 = {
+		"a":
+		func():
+			var x = 1
+			return x,
+		"b":
+		func():
+			var x = 1
+			return x
+	}
+	var x4 = {
+		"a":
+		func():
+			var x = 1
+			return x,
+		"b":
+		func():
+			var x = 1
+			return x
+	}
+	var x5 = {
+		"a":
+		func():
+			var x = 1
+			return x,
+		"b":
+		func():
+			var x = 1
+			return x
+	}
+	var x6 = {
+		"a":
+		func():
+			var x = 1
+			return x,
+		"b":
+		func():
+			var x = 1
+			return x
+	}
+	var x7 = {
+		"a":
+		func():
+			var x = 1
+			if x > 0:
+				print(x),
+		"b":
+		func():
+			var x = 1
+			return x
+	}
+	var x8 = {
+		"a":
+		func():
+			var x = 1
+			if x > 0:
+				print(x),
+		"b":
+		func():
+			var x = 1
+			return x
+	}
+	var x9 = {
+		"a":
+		func():
+			var x = 1
+			if x > 0:
+				print(x),
+		"b":
+		func():
+			var x = 1
+			return x
+	}
+
+
+func nested():
+	var x1 = func():
+		var x1r = func():
+			var x = 1
+			return x
+		return x1r
+
+	var x2 = func():
+		var x2r = func():
+			pass
+			pass
+		pass
+
+	var x3 = func():
+		var x3r = func():
+			var x3rr = func():
+				pass
+				pass
+			pass
+		pass
+
+	var x4 = func():
+		if true:
+			var x4r = func():
+				pass
+				pass
+			pass
+		pass
+
+	var x5 = func():
+		if true:
+			var x5r = func():
+				if true:
+					pass
+					pass
+				pass
+			pass
+		pass
+
+	var x6 = func():
+		if true:
+			var x6r = func():
+				if true:
+					var x6rr = func():
+						pass
+						pass
+					pass
+				pass
+			pass
+		pass
+
+	# TODO: fix
+	# var x7 = [func():
+	# 	pass
+	# 	var x = func():
+	# 		pass
+	# 		pass,]
diff --git a/tests/formatter/input-output-pairs/inline_lambdas_w_comments.out.gd b/tests/formatter/input-output-pairs/inline_lambdas_w_comments.out.gd
index c62349d6..fdf9a41a 100644
--- a/tests/formatter/input-output-pairs/inline_lambdas_w_comments.out.gd
+++ b/tests/formatter/input-output-pairs/inline_lambdas_w_comments.out.gd
@@ -26,7 +26,8 @@ func foo():
 		p21,
 		p22,
 		p23
-	): pass  # inline b
+	):
+		pass  # inline b
 	# c
 	var x3 = func baz(  # inline c
 		# d
@@ -55,48 +56,52 @@ func foo():
 		p22,
 		p23  # inline e
 		# f
-	) -> int: pass ; pass ; var x := [  # inline f
-		# g
-		0,  # inline g
-		# h
-		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  # inline h
-		# i
-	] ; pass  # inline i
+	) -> int:
+		pass
+		pass
+		var x := [  # inline f
+			# g
+			0,  # inline g
+			# h
+			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  # inline h
+			# i
+		]
+		pass  # inline i
 	# j
diff --git a/tests/formatter/input-output-pairs/long_inline_lambdas.in.gd b/tests/formatter/input-output-pairs/long_inline_lambdas.in.gd
deleted file mode 100644
index 972ff78b..00000000
--- a/tests/formatter/input-output-pairs/long_inline_lambdas.in.gd
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-	var x3 = func bar(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 x4 = 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
-
-	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
-	var x8 = 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;var xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx;pass
-	var x9 = 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;var x=[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 x10 = 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;var xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:int;pass
-	var x11 = 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;var x:Array=[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 x12 = 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;var x:=[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
diff --git a/tests/formatter/input-output-pairs/long_inline_lambdas.out.gd b/tests/formatter/input-output-pairs/long_inline_lambdas.out.gd
deleted file mode 100644
index bc188974..00000000
--- a/tests/formatter/input-output-pairs/long_inline_lambdas.out.gd
+++ /dev/null
@@ -1,508 +0,0 @@
-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
-	var x3 = func bar(
-		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 x4 = 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
-
-	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
-	var x8 = 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 ; var xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ; pass
-	var x9 = 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 ; var x = [
-		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 x10 = 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 ; var xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx: int ; pass
-	var x11 = 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 ; var x: Array = [
-		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 x12 = 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 ; var x := [
-		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
diff --git a/tests/formatter/test_input_output_pairs.py b/tests/formatter/test_input_output_pairs.py
index 6750a832..235332af 100644
--- a/tests/formatter/test_input_output_pairs.py
+++ b/tests/formatter/test_input_output_pairs.py
@@ -7,7 +7,7 @@
 DATA_DIR = "./input-output-pairs"
 EXCEPTIONS = set(
     [
-        "long_inline_lambdas",
+        # TODO: fix
         "inline_lambdas_w_comments",
     ]
 )  # type: Set[str]