Revert "parser: experimental syntax that doesn't require an extra indent"

spytheman · spytheman · commit aed58078e92d · 2025-06-24T09:47:17.000+03:00
This reverts commit cb3a106.
diff --git a/vlib/v/ast/ast.v b/vlib/v/ast/ast.v
@@ -1267,7 +1267,6 @@ pub mut:
 	cond_type     Type // type of `x` in `match x {`
 	expected_type Type // for debugging only
 	is_sum_type   bool
-	no_lcbr       bool // for match statements without {}
 }
 
 pub struct MatchBranch {
diff --git a/vlib/v/fmt/fmt.v b/vlib/v/fmt/fmt.v
@@ -2858,12 +2858,8 @@ fn (mut f Fmt) match_branch(branch ast.MatchBranch, single_line bool) {
 pub fn (mut f Fmt) match_expr(node ast.MatchExpr) {
 	f.write('match ')
 	f.expr(node.cond)
-	if node.no_lcbr {
-		f.writeln('')
-	} else {
-		f.writeln(' {')
-		f.indent++
-	}
+	f.writeln(' {')
+	f.indent++
 	f.comments(node.comments)
 	mut single_line := true
 	for branch in node.branches {
@@ -2890,10 +2886,8 @@ pub fn (mut f Fmt) match_expr(node ast.MatchExpr) {
 	if else_idx >= 0 {
 		f.match_branch(node.branches[else_idx], single_line)
 	}
-	if !node.no_lcbr {
-		f.indent--
-		f.write('}')
-	}
+	f.indent--
+	f.write('}')
 }
 
 pub fn (mut f Fmt) offset_of(node ast.OffsetOf) {
diff --git a/vlib/v/parser/if_match.v b/vlib/v/parser/if_match.v
@@ -375,7 +375,7 @@ fn (mut p Parser) match_expr() ast.MatchExpr {
 		len:     match_last_pos.pos - match_first_pos.pos + match_last_pos.len
 		col:     match_first_pos.col
 	}
-	if p.tok.kind == .rcbr && !no_lcbr {
+	if p.tok.kind == .rcbr {
 		p.check(.rcbr)
 	}
 	// return ast.StructInit{}
@@ -386,7 +386,6 @@ fn (mut p Parser) match_expr() ast.MatchExpr {
 		is_sum_type: is_sum_type
 		pos:         pos
 		comments:    comments
-		no_lcbr:     no_lcbr
 	}
 }
 
diff --git a/vlib/v/tests/options/option_match_test.v b/vlib/v/tests/options/option_match_test.v
@@ -1,32 +1,35 @@
 fn test_simple_match_expr() {
 	mut a := ?int(12)
-	match a?
-	12 {
-		println(a)
-	}
-	else {
-		println('else')
-		assert false
+	match a? {
+		12 {
+			println(a)
+		}
+		else {
+			println('else')
+			assert false
+		}
 	}
 
-	match a
-	none {
-		println('none')
-		assert false
-	}
-	else {
-		println('else')
+	match a {
+		none {
+			println('none')
+			assert false
+		}
+		else {
+			println('else')
+		}
 	}
 
 	a = none
 
-	match a
-	none {
-		println('none')
-	}
-	else {
-		println('else')
-		assert false
+	match a {
+		none {
+			println('none')
+		}
+		else {
+			println('else')
+			assert false
+		}
 	}
 
 	mut b := ?string('aaa')
@@ -40,23 +43,24 @@ fn test_simple_match_expr() {
 		}
 	}
 
-	match b
-	none {
-		println('none')
-		assert false
-	}
-	else {
-		println('else')
+	match b {
+		none {
+			println('none')
+			assert false
+		}
+		else {
+			println('else')
+		}
 	}
 
 	b = none
-	match b
-	none {
-		println('none')
-	}
-	else {
-		println('else')
-		assert false
+	match b {
+		none {
+			println('none')
+		}
+		else {
+			println('else')
+			assert false
+		}
 	}
-
 }

Original file line number	Diff line number	Diff line change
`@@ -1267,7 +1267,6 @@ pub mut:`
`1267`	`1267`	cond_type Type // type of `x` in `match x {`
`1268`	`1268`	`expected_type Type // for debugging only`
`1269`	`1269`	`is_sum_type bool`
`1270`		`- no_lcbr bool // for match statements without {}`
`1271`	`1270`	`}`
`1272`	`1271`
`1273`	`1272`	`pub struct MatchBranch {`
Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ fn (mut p Parser) match_expr() ast.MatchExpr {`
`375`	`375`	`len: match_last_pos.pos - match_first_pos.pos + match_last_pos.len`
`376`	`376`	`col: match_first_pos.col`
`377`	`377`	`}`
`378`		`- if p.tok.kind == .rcbr && !no_lcbr {`
	`378`	`+ if p.tok.kind == .rcbr {`
`379`	`379`	`p.check(.rcbr)`
`380`	`380`	`}`
`381`	`381`	`// return ast.StructInit{}`
`@@ -386,7 +386,6 @@ fn (mut p Parser) match_expr() ast.MatchExpr {`
`386`	`386`	`is_sum_type: is_sum_type`
`387`	`387`	`pos: pos`
`388`	`388`	`comments: comments`
`389`		`- no_lcbr: no_lcbr`
`390`	`389`	`}`
`391`	`390`	`}`
`392`	`391`