Force composite literals with comments to be multi line again

4 files changed, 198 insertions, 71 deletions

diff --git a/tools/odinfmt/tests/.snapshots/calls.odin b/tools/odinfmt/tests/.snapshots/calls.odin
index 5ad8249..72e37fb 100644
--- a/tools/odinfmt/tests/.snapshots/calls.odin
+++ b/tools/odinfmt/tests/.snapshots/calls.odin
@@ -39,13 +39,96 @@ calls :: proc() {
 			ddddddddddddddddddddddddddddddddddddd,
 		),
 	)
+	result = vk.CreateInsance(
+		my_really_cool_call(
+			T{1, 2, 3},
+			aaaaaaaaaaaaaaaaaaaaa,
+			bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+			cccccccccccccccccccccccccccccccc,
+			ddddddddddddddddddddddddddddddddddddd,
+		),
+	)
+	result = vk.CreateInsance(
+		my_really_cool_call(
+			T{a = 1, b = 2, c = 3},
+			aaaaaaaaaaaaaaaaaaaaa,
+			bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+			cccccccccccccccccccccccccccccccc,
+			ddddddddddddddddddddddddddddddddddddd,
+		),
+	)
+	result = vk.CreateInsance(my_really_cool_call(
+		T{
+			1, 2, 3,
+		},
+		aaaaaaaaaaaaaaaaaaaaa,
+		bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+		cccccccccccccccccccccccccccccccc,
+		ddddddddddddddddddddddddddddddddddddd,
+	))
+	result = vk.CreateInsance(my_really_cool_call(
+		T{
+			a = 1,
+			b = 2,
+			c = 3,
+		},
+		aaaaaaaaaaaaaaaaaaaaa,
+		bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+		cccccccccccccccccccccccccccccccc,
+		ddddddddddddddddddddddddddddddddddddd,
+	))
+
+
+	result = vk.CreateInsance(
+		my_really_cool_call(
+			T{
+				aaaaaaaaaaaaaaaaaaaaa,
+				bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+				cccccccccccccccccccccccccccccccc,
+				ddddddddddddddddddddddddddddddddddddd,
+			},
+		),
+	)
+	result = vk.CreateInsance(
+		my_really_cool_call(
+			T{
+				a = aaaaaaaaaaaaaaaaaaaaa,
+				b = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+				c = cccccccccccccccccccccccccccccccc,
+				d = ddddddddddddddddddddddddddddddddddddd,
+			},
+		),
+	)
+	result = vk.CreateInsance(my_really_cool_call(T{
+		aaaaaaaaaaaaaaaaaaaaa,
+		bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+		cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd,
+	}))
+	result = vk.CreateInsance(my_really_cool_call(T{
+		a = aaaaaaaaaaaaaaaaaaaaa,
+		b = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+		c = cccccccccccccccccccccccccccccccc,
+		d = ddddddddddddddddddddddddddddddddddddd +
+		ddddddddddddddddddddddddddddddddddddd,
+	}))
+	result = vk.CreateInsance(my_really_cool_call(T{
+		a = aaaaaaaaaaaaaaaaaaaaa,
+		b = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+		c = cccccccccccccccccccccccccccccccc,
+		d = ddddddddddddddddddddddddddddddddddddd + 1,
+	}))
 
 	_ = vk.CreateInsance(my_really_cool_call(1, 2, 3))
 	_ = vk.CreateInsance(my_really_cool_call(
-			1,
-			2,
-			3,
-		))
+		1,
+		2,
+		3,
+	))
+	_ = vk.CreateInsance(my_really_cool_call(
+		1,
+		2,
+		3,
+	))
 	_ = vk.CreateInsance(1, 2, 3)
 	_ = vk.CreateInsance(
 		1,
@@ -56,47 +139,47 @@ calls :: proc() {
 	_ = vk.CreateInsance(Composite{a = 1, b = 2})
 	_ = vk.CreateInsance(Composite{a = 1, b = 2})
 	_ = vk.CreateInsance(Composite{
-			a = 1,
-			b = 2,
-		})
+		a = 1,
+		b = 2,
+	})
 	_ = vk.CreateInsance(Composite{1, 2, 3, 4})
 	_ = vk.CreateInsance(Composite{
-			1, 2,
-			3, 4,
-		})
+		1, 2,
+		3, 4,
+	})
 	_ = vk.CreateInsance(matrix[2, 2]i32{
-			1, 2, 
-			3, 4, 
-		})
+		1, 2, 
+		3, 4, 
+	})
 	_ = vk.CreateInsance(matrix[2, 2]i32{
-			1, 2, 
-			3, 4, 
-		})
+		1, 2, 
+		3, 4, 
+	})
 
 	_ = vk.CreateInsance(Composite{
-			p = proc(_: int) -> int {return 42},
-		})
+		p = proc(_: int) -> int {return 42},
+	})
 	_ = vk.CreateInsance(Composite{
-			p = proc(_: int) -> int {
-				return 42},
-		})
+		p = proc(_: int) -> int {
+			return 42},
+	})
 	_ = vk.CreateInsance(Composite{
-			p = proc(_: int) -> int {
-				return 42
-			},
-		})
+		p = proc(_: int) -> int {
+			return 42
+		},
+	})
 	_ = vk.CreateInsance(Composite{
-			p = proc(_: int) -> int {
-				return 42},
-		})
+		p = proc(_: int) -> int {
+			return 42},
+	})
 	_ = vk.CreateInsance(Composite{
-			p = proc(_: int) -> int {
-				return 42
-			},
-		})
+		p = proc(_: int) -> int {
+			return 42
+		},
+	})
 	_ = vk.CreateInsance(Composite{
-			p = proc(_: int) -> int {return 42},
-		})
+		p = proc(_: int) -> int {return 42},
+	})
 
 	test_2(Foo{
 		field1 = 1,
diff --git a/tools/odinfmt/tests/.snapshots/comp_lit.odin b/tools/odinfmt/tests/.snapshots/comp_lit.odin
index fae3a4b..bbef149 100644
--- a/tools/odinfmt/tests/.snapshots/comp_lit.odin
+++ b/tools/odinfmt/tests/.snapshots/comp_lit.odin
@@ -2,30 +2,41 @@ package odinfmt_test
 
 
 main :: proc() {
-	_ = SameLine{a = 1, b = 2, c = 3}
-	_ = MultiLine{
-		a = 1,
-		b = 2,
-		c = 3,
+	T :: struct {
+		a, b, c, d: int,
 	}
-	_ = array_like{0, 1, 2, 3}
-	_ = array_like{
-		0, 1,
-		2, 3,
+	_ = T{0, 0, 0, 0}
+	_ = T{
+		0, 0, 0, 0,
 	}
-	_ = array_like{
-		0, 1,
-		2, 3,
+	_ = T{
+		0,
+		0,
+		0,
+		0,
 	}
-	_ = array_like{
-		0, 1,
-		2, 3,
+	_ = T{
+		0, 0,
+		0, 0,
 	}
-	_ = array_like{
-		0, 1,
-		2,
-		3, 4, 5, 6, 7,
-		8,
+	_ = T{a = 0, b = 0, c = 0, d = 0}
+	_ = T{
+		a = 0,
+		b = 0,
+		c = 0,
+		d = 0,
+	}
+	_ = T{
+		a = 0,
+		b = 0,
+		c = 0,
+		d = 0,
+	}
+	_ = T{
+		a = 0,
+		b = 0,
+		c = 0,
+		d = 0,
 	}
 
 	sort.sort(sort.Interface{
diff --git a/tools/odinfmt/tests/calls.odin b/tools/odinfmt/tests/calls.odin
index b9fe588..febe4de 100644
--- a/tools/odinfmt/tests/calls.odin
+++ b/tools/odinfmt/tests/calls.odin
@@ -9,10 +9,32 @@ calls :: proc() {
 	result := vk.CreateInsance(my_really_cool_call(aaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd))
 
 	result = vk.CreateInsance(my_really_cool_call(aaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd))
+	result = vk.CreateInsance(my_really_cool_call(T{1,2,3},aaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd))
+	result = vk.CreateInsance(my_really_cool_call(T{a=1,b=2,c=3},aaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd))
+	result = vk.CreateInsance(my_really_cool_call(T{
+		1,2,3},aaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd))
+	result = vk.CreateInsance(my_really_cool_call(T{
+		a=1,b=2,c=3},aaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd))
 	
+
+	result = vk.CreateInsance(my_really_cool_call(T{aaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd}))
+	result = vk.CreateInsance(my_really_cool_call(T{a=aaaaaaaaaaaaaaaaaaaaa,b=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,c=cccccccccccccccccccccccccccccccc,d=ddddddddddddddddddddddddddddddddddddd}))
+	result = vk.CreateInsance(my_really_cool_call(T{
+		aaaaaaaaaaaaaaaaaaaaa, 
+		bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd}))
+	result = vk.CreateInsance(my_really_cool_call(T{
+		a=aaaaaaaaaaaaaaaaaaaaa,
+		b=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,c=cccccccccccccccccccccccccccccccc,d=ddddddddddddddddddddddddddddddddddddd+ddddddddddddddddddddddddddddddddddddd}))
+	result = vk.CreateInsance(my_really_cool_call(T{
+		a=aaaaaaaaaaaaaaaaaaaaa,
+		b=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,c=cccccccccccccccccccccccccccccccc,d=ddddddddddddddddddddddddddddddddddddd+1}))
+
 	_ = vk.CreateInsance(my_really_cool_call(1,2,3))
 	_ = vk.CreateInsance(my_really_cool_call(1,
 		2,3))
+	_ = vk.CreateInsance(my_really_cool_call(1,
+		2,3,),
+)
 	_ = vk.CreateInsance(1,2,3)
 	_ = vk.CreateInsance(1,
 		2,3)
diff --git a/tools/odinfmt/tests/comp_lit.odin b/tools/odinfmt/tests/comp_lit.odin
index dc4ee7b..8859cb0 100644
--- a/tools/odinfmt/tests/comp_lit.odin
+++ b/tools/odinfmt/tests/comp_lit.odin
@@ -2,25 +2,36 @@ package odinfmt_test
 
 
 main :: proc() {
-	_ =    SameLine{a=1   ,b=2,c=3}
-	_ = MultiLine{a=1   ,
-		b=2,c=3}
-	_ = array_like{0,1,2,3}
-	_ = array_like{
-		0,1,
-		2,3}
-	_ = array_like{
-		0,1,
-		2,3,
+	T :: struct {
+		a, b, c, d: int,
 	}
-	_ = array_like{0,1,
-		2,3,
+	_ = T{0,0,0,0}
+	_ = T{
+		0,0,0,0,
 	}
-	_ = array_like {
-		0,1,
-		2,
-		3,4,5,6,7,
-		8,
+	_ = T{
+		0,
+		  0,
+		0,
+		  0,
+	}
+	_ = T{
+		0,0,
+		0,0,
+	}
+	_ = T{a=0,b=0,c=0,d=0}
+	_ = T{
+		a=0,b=0,c=0,d=0,
+	}
+	_ = T{
+		a=0,
+		b=0,
+		c=0,
+		d=0,
+	}
+	_ = T{
+		a=0,b=0,
+		c=0,d=0,
 	}
 
 	sort.sort(sort.Interface{len = proc(it: sort.Interface) -> int {