Fix issue with anon structs in arrays.

DanielGavin · Nov 4, 2023 · 3294b99 · 3294b99
1 parent dcaa30b
commit 3294b99
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 33 deletions.
diff --git a/src/odin/format/format.odin b/src/odin/format/format.odin
@@ -81,6 +81,8 @@ format :: proc(
 
 	ok := parser.parse_file(&p, &file)
 
+	fmt.println(file.syntax_error_count)
+
 	if !ok || file.syntax_error_count > 0 {
 		return {}, false
 	}

diff --git a/src/odin/printer/visit.odin b/src/odin/printer/visit.odin
@@ -2015,7 +2015,7 @@ visit_expr :: proc(
 		}
 
 		if v.type != nil {
-			document = cons_with_nopl(document, visit_expr(p, v.type))
+			document = cons_with_nopl(document, group(visit_expr(p, v.type)))
 
 			if matrix_type, ok := v.type.derived.(^ast.Matrix_Type);
 			   ok && len(v.elems) > 0 && is_matrix_type_constant(matrix_type) {
@@ -2081,16 +2081,21 @@ visit_expr :: proc(
 		} else {
 			document = cons(
 				document,
-				text("{"),
-				nest(
+				group(
 					cons(
+						if_break(" "),
+						text("{"),
+						nest(
+							cons(
+								break_with(""),
+								visit_exprs(p, v.elems, {.Add_Comma, .Group}),
+							),
+						),
+						if_break(","),
 						break_with(""),
-						visit_exprs(p, v.elems, {.Add_Comma, .Group}),
+						text("}"),
 					),
 				),
-				if_break(","),
-				break_with(""),
-				text("}"),
 			)
 			document = group(document)
 		}

diff --git a/tools/odinfmt/tests/.snapshots/calls.odin b/tools/odinfmt/tests/.snapshots/calls.odin
@@ -79,7 +79,7 @@ calls :: proc() {
 
 	result = vk.CreateInsance(
 		my_really_cool_call(
-			T{
+			T {
 				aaaaaaaaaaaaaaaaaaaaa,
 				bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
 				cccccccccccccccccccccccccccccccc,
@@ -89,7 +89,7 @@ calls :: proc() {
 	)
 	result = vk.CreateInsance(
 		my_really_cool_call(
-			T{
+			T {
 				a = aaaaaaaaaaaaaaaaaaaaa,
 				b = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
 				c = cccccccccccccccccccccccccccccccc,
@@ -99,7 +99,7 @@ calls :: proc() {
 	)
 	result = vk.CreateInsance(
 		my_really_cool_call(
-			T{
+			T {
 				aaaaaaaaaaaaaaaaaaaaa,
 				bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
 				cccccccccccccccccccccccccccccccc,
@@ -111,7 +111,7 @@ calls :: proc() {
 	)
 	result = vk.CreateInsance(
 		my_really_cool_call(
-			T{
+			T {
 				a = aaaaaaaaaaaaaaaaaaaaa,
 				b = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
 				c = cccccccccccccccccccccccccccccccc,
@@ -122,7 +122,7 @@ calls :: proc() {
 	)
 	result = vk.CreateInsance(
 		my_really_cool_call(
-			T{
+			T {
 				a = aaaaaaaaaaaaaaaaaaaaa,
 				b = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
 				c = cccccccccccccccccccccccccccccccc,
@@ -152,7 +152,7 @@ calls :: proc() {
 		})
 
 	test_2(
-		Foo{
+		Foo {
 			field1 = 1,
 			field2 = "hello",
 			field3 = 1,
@@ -169,7 +169,7 @@ calls :: proc() {
 	})
 
 	test3(
-		Foo{
+		Foo {
 			field1 = 1,
 			field2 = "hello",
 			field3 = 1,
@@ -185,7 +185,7 @@ calls :: proc() {
 
 	resuuuuuuuuult := add_to_long_list_of_values(
 		fooooooooooooo,
-		Foo{
+		Foo {
 			field1 = 1,
 			field2 = "hello",
 			field3 = 1,

diff --git a/tools/odinfmt/tests/random/.snapshots/document.odin b/tools/odinfmt/tests/random/.snapshots/document.odin
@@ -293,7 +293,7 @@ fits :: proc(width: int, list: ^[dynamic]Tuple) -> bool {
 		case Document_Cons:
 			append(
 				list,
-				Tuple{
+				Tuple {
 					indentation = data.indentation,
 					mode = data.mode,
 					document = v.rhs,
@@ -302,7 +302,7 @@ fits :: proc(width: int, list: ^[dynamic]Tuple) -> bool {
 			)
 			append(
 				list,
-				Tuple{
+				Tuple {
 					indentation = data.indentation,
 					mode = data.mode,
 					document = v.lhs,
@@ -312,7 +312,7 @@ fits :: proc(width: int, list: ^[dynamic]Tuple) -> bool {
 		case Document_Align:
 			append(
 				list,
-				Tuple{
+				Tuple {
 					indentation = 0,
 					mode = data.mode,
 					document = v.document,
@@ -322,7 +322,7 @@ fits :: proc(width: int, list: ^[dynamic]Tuple) -> bool {
 		case Document_Nest:
 			append(
 				list,
-				Tuple{
+				Tuple {
 					indentation = data.indentation + v.indentation,
 					mode = data.mode,
 					document = v.document,
@@ -345,7 +345,7 @@ fits :: proc(width: int, list: ^[dynamic]Tuple) -> bool {
 			if data.mode == .Break {
 				append(
 					list,
-					Tuple{
+					Tuple {
 						indentation = data.indentation + v.indentation,
 						mode = data.mode,
 						document = v.document,
@@ -355,7 +355,7 @@ fits :: proc(width: int, list: ^[dynamic]Tuple) -> bool {
 			} else {
 				append(
 					list,
-					Tuple{
+					Tuple {
 						indentation = data.indentation,
 						mode = data.mode,
 						document = v.document,
@@ -366,7 +366,7 @@ fits :: proc(width: int, list: ^[dynamic]Tuple) -> bool {
 		case Document_Group:
 			append(
 				list,
-				Tuple{
+				Tuple {
 					indentation = data.indentation,
 					mode = data.mode,
 					document = v.document,
@@ -430,7 +430,7 @@ format :: proc(
 		case Document_Cons:
 			append(
 				list,
-				Tuple{
+				Tuple {
 					indentation = data.indentation,
 					mode = data.mode,
 					document = v.rhs,
@@ -439,7 +439,7 @@ format :: proc(
 			)
 			append(
 				list,
-				Tuple{
+				Tuple {
 					indentation = data.indentation,
 					mode = data.mode,
 					document = v.lhs,
@@ -449,7 +449,7 @@ format :: proc(
 		case Document_Nest:
 			append(
 				list,
-				Tuple{
+				Tuple {
 					indentation = data.indentation + v.indentation,
 					mode = data.mode,
 					document = v.document,
@@ -459,7 +459,7 @@ format :: proc(
 		case Document_Align:
 			append(
 				list,
-				Tuple{
+				Tuple {
 					indentation = 0,
 					mode = data.mode,
 					document = v.document,
@@ -492,7 +492,7 @@ format :: proc(
 			if mode == .Break {
 				append(
 					list,
-					Tuple{
+					Tuple {
 						indentation = data.indentation + v.indentation,
 						mode = data.mode,
 						document = v.document,
@@ -502,7 +502,7 @@ format :: proc(
 			} else {
 				append(
 					list,
-					Tuple{
+					Tuple {
 						indentation = data.indentation,
 						mode = data.mode,
 						document = v.document,
@@ -519,7 +519,7 @@ format :: proc(
 
 			append(
 				&l,
-				Tuple{
+				Tuple {
 					indentation = data.indentation,
 					mode = .Flat,
 					document = v.document,
@@ -530,7 +530,7 @@ format :: proc(
 			if data.mode == .Fit {
 				append(
 					list,
-					Tuple{
+					Tuple {
 						indentation = data.indentation,
 						mode = .Fit,
 						document = v.document,
@@ -540,7 +540,7 @@ format :: proc(
 			} else if fits(width - consumed, &l) && v.mode != .Break {
 				append(
 					list,
-					Tuple{
+					Tuple {
 						indentation = data.indentation,
 						mode = .Flat,
 						document = v.document,
@@ -551,7 +551,7 @@ format :: proc(
 				if v.mode == .Fit {
 					append(
 						list,
-						Tuple{
+						Tuple {
 							indentation = data.indentation,
 							mode = .Fit,
 							document = v.document,
@@ -561,7 +561,7 @@ format :: proc(
 				} else {
 					append(
 						list,
-						Tuple{
+						Tuple {
 							indentation = data.indentation,
 							mode = .Break,
 							document = v.document,