language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-12-10 02:59:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Attach comma token to MATCH_ARM instead of MATCH_ARM_LIST

Browse source
This commit is contained in:
Lukas Wirth 2021-07-29 22:32:24 +02:00
parent 8d3b294ef7
commit 4de447b293
15 changed files with 113 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/parser/src/grammar/expressions/atom.rs
View file

@ -400,20 +400,7 @@ pub(crate) fn match_arm_list(p: &mut Parser) {
error_block(p, "expected match arm");
continue;
}
// test match_arms_commas
// fn foo() {
// match () {
// _ => (),
// _ => {}
// _ => ()
// }
// }
if match_arm(p).is_block() {
p.eat(T![,]);
} else if !p.at(T!['}']) {
p.expect(T![,]);
}
match_arm(p);
}
p.expect(T!['}']);
m.complete(p, MATCH_ARM_LIST);
@ -429,7 +416,7 @@ pub(crate) fn match_arm_list(p: &mut Parser) {
// | X => (),
// };
// }
fn match_arm(p: &mut Parser) -> BlockLike {
fn match_arm(p: &mut Parser) {
let m = p.start();
// test match_arms_outer_attributes
// fn foo() {
@ -452,8 +439,21 @@ fn match_arm(p: &mut Parser) -> BlockLike {
}
p.expect(T![=>]);
let blocklike = expr_stmt(p).1;
// test match_arms_commas
// fn foo() {
// match () {
// _ => (),
// _ => {}
// _ => ()
// }
// }
if blocklike.is_block() {
p.eat(T![,]);
} else if !p.at(T!['}']) {
p.expect(T![,]);
}
m.complete(p, MATCH_ARM);
blocklike
}
// test match_guard