parser: fix infix expr comment in middle (fix #24183) (#25671)

kbkpbot · web-flow · commit b470780a3764 · 2025-11-05T14:43:33.000+02:00
diff --git a/vlib/v/fmt/tests/infix_expr_with_comments_keep.vv b/vlib/v/fmt/tests/infix_expr_with_comments_keep.vv
@@ -2,8 +2,29 @@ fn main() {
 	a := 4 // comment1
 	 + 6 // comment2
 
-	b := 5 + // comment2
+	b := 5 + // comment3
 	 6
 
-	c := 4 + 6 // comment3
+	c := 4 + 6 // comment4
+
+	var := 'a' // comment5
+	 + 'b' // comment6
+	 + 'c' // comment7
+
+	// vfmt off
+pattern := r'^('
+	+ r'(\^|([<>]?=?))?'       // match: ^, >, <, =, >=, <=
+	+ r'((\*)|([0-9]+))'       // match: *, 1
+	+ r'((\.?\*)|(\.[0-9]+))?' // match: *, .*, .1
+	+ r'((\.?\*)|(\.[0-9]+))?' // match: *, .*, .1
+	+ r'(-[0-9a-zA-Z.]+)?)'    // match prerelease part e.g: -beta.1
+	+ r'|(\*)$'                // match just '*'
+	// vfmt on
+
+	pattern_fmt := r'^(' + r'(\^|([<>]?=?))?' // match: ^, >, <, =, >=, <=
+	 + r'((\*)|([0-9]+))' // match: *, 1
+	 + r'((\.?\*)|(\.[0-9]+))?' // match: *, .*, .1
+	 + r'((\.?\*)|(\.[0-9]+))?' // match: *, .*, .1
+	 + r'(-[0-9a-zA-Z.]+)?)' // match prerelease part e.g: -beta.1
+	 + r'|(\*)$' // match just '*'
 }
diff --git a/vlib/v/parser/expr.v b/vlib/v/parser/expr.v
@@ -552,9 +552,8 @@ fn (mut p Parser) check_expr(precedence int) !ast.Expr {
 	if p.inside_if_cond {
 		p.if_cond_comments << p.eat_comments()
 	}
-	if p.pref.is_fmt && p.tok.kind == .comment && p.peek_tok.kind.is_infix() && !p.inside_infix
-		&& !p.inside_map_init && !(p.peek_tok.kind == .mul
-		&& p.peek_tok.pos().line_nr != p.tok.pos().line_nr) {
+	if p.pref.is_fmt && p.tok.kind == .comment && p.peek_tok.kind.is_infix() && !p.inside_map_init
+		&& !(p.peek_tok.kind == .mul && p.peek_tok.pos().line_nr != p.tok.pos().line_nr) {
 		p.left_comments = p.eat_comments()
 	}
 	return p.expr_with_left(node, precedence, is_stmt_ident)

Original file line number	Diff line number	Diff line change
`@@ -552,9 +552,8 @@ fn (mut p Parser) check_expr(precedence int) !ast.Expr {`
`552`	`552`	`if p.inside_if_cond {`
`553`	`553`	`p.if_cond_comments << p.eat_comments()`
`554`	`554`	`}`
`555`		`- if p.pref.is_fmt && p.tok.kind == .comment && p.peek_tok.kind.is_infix() && !p.inside_infix`
`556`		`- && !p.inside_map_init && !(p.peek_tok.kind == .mul`
`557`		`- && p.peek_tok.pos().line_nr != p.tok.pos().line_nr) {`
	`555`	`+ if p.pref.is_fmt && p.tok.kind == .comment && p.peek_tok.kind.is_infix() && !p.inside_map_init`
	`556`	`+ && !(p.peek_tok.kind == .mul && p.peek_tok.pos().line_nr != p.tok.pos().line_nr) {`
`558`	`557`	`p.left_comments = p.eat_comments()`
`559`	`558`	`}`
`560`	`559`	`return p.expr_with_left(node, precedence, is_stmt_ident)`