Skip to content

parser: fix comments parsing on map init #18389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
medvednikov merged 1 commit into from
Jun 9, 2023
Merged

parser: fix comments parsing on map init #18389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions vlib/v/fmt/tests/map_init_comments_keep.vv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
enum HttpHeader {
user_agent
referer
}

headers := {
HttpHeader.user_agent: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36' // content_length: '17' // <-- will be deleted
.referer: 'wwww.google.com' // content_length: '17' // <-- won't be deleted
}
3 changes: 2 additions & 1 deletion vlib/v/parser/expr.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,8 @@ fn (mut p Parser) check_expr(precedence int) !ast.Expr {
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.peek_tok.kind == .mul && p.peek_tok.pos().line_nr != p.tok.pos().line_nr) {
&& !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)
Expand Down
⚡