Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 01:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #1722

Browse source 
1722: Parse `box` keyword in patterns below top-level r=matklad a=ecstatic-morse

This extends the parser to handle patterns like `if let Some(box x) = ...` where the `box` keyword is not at the top-level. The last line of the added test caused a `ParseError`. This is a variant of #1412 which was not fixed by #1414.

~~I'm not familiar with `rust-analyzer`, otherwise I would fix this as well 😄.~~

Co-authored-by: Dylan MacKenzie <ecstaticmorse@gmail.com>
This commit is contained in:
bors[bot] 2019-08-22 19:58:35 +00:00 committed by GitHub
commit daf1a96ff0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 52 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_parser/src/grammar/expressions/atom.rs
View file

@ -414,6 +414,8 @@ pub(crate) fn match_arm_list(p: &mut Parser) {
// X | Y if Z => (),
// | X | Y if Z => (),
// | X => (),
// box X => (),
// Some(box X) => (),
// };
// }
fn match_arm(p: &mut Parser) -> BlockLike {

2
crates/ra_parser/src/grammar/patterns.rs
View file

@ -2,7 +2,7 @@ use super::*;
pub(super) const PATTERN_FIRST: TokenSet = expressions::LITERAL_FIRST
.union(paths::PATH_FIRST)
.union(token_set![REF_KW, MUT_KW, L_PAREN, L_BRACK, AMP, UNDERSCORE, MINUS]);
.union(token_set![BOX_KW, REF_KW, MUT_KW, L_PAREN, L_BRACK, AMP, UNDERSCORE, MINUS]);
pub(super) fn pattern(p: &mut Parser) {
pattern_r(p, PAT_RECOVERY_SET);

2
crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rs
View file

@ -5,5 +5,7 @@ fn foo() {
X | Y if Z => (),
| X | Y if Z => (),
| X => (),
box X => (),
Some(box X) => (),
};
}

59
crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt
View file

@ -1,5 +1,5 @@
SOURCE_FILE@[0; 167)
FN_DEF@[0; 166)
SOURCE_FILE@[0; 215)
FN_DEF@[0; 214)
FN_KW@[0; 2) "fn"
WHITESPACE@[2; 3) " "
NAME@[3; 6)
@ -8,18 +8,18 @@ SOURCE_FILE@[0; 167)
L_PAREN@[6; 7) "("
R_PAREN@[7; 8) ")"
WHITESPACE@[8; 9) " "
BLOCK@[9; 166)
BLOCK@[9; 214)
L_CURLY@[9; 10) "{"
WHITESPACE@[10; 15) "\n "
EXPR_STMT@[15; 164)
MATCH_EXPR@[15; 163)
EXPR_STMT@[15; 212)
MATCH_EXPR@[15; 211)
MATCH_KW@[15; 20) "match"
WHITESPACE@[20; 21) " "
TUPLE_EXPR@[21; 23)
L_PAREN@[21; 22) "("
R_PAREN@[22; 23) ")"
WHITESPACE@[23; 24) " "
MATCH_ARM_LIST@[24; 163)
MATCH_ARM_LIST@[24; 211)
L_CURLY@[24; 25) "{"
WHITESPACE@[25; 34) "\n "
MATCH_ARM@[34; 41)
@ -141,9 +141,44 @@ SOURCE_FILE@[0; 167)
L_PAREN@[154; 155) "("
R_PAREN@[155; 156) ")"
COMMA@[156; 157) ","
WHITESPACE@[157; 162) "\n "
R_CURLY@[162; 163) "}"
SEMI@[163; 164) ";"
WHITESPACE@[164; 165) "\n"
R_CURLY@[165; 166) "}"
WHITESPACE@[166; 167) "\n"
WHITESPACE@[157; 166) "\n "
MATCH_ARM@[166; 177)
BIND_PAT@[166; 171)
BOX_KW@[166; 169) "box"
WHITESPACE@[169; 170) " "
NAME@[170; 171)
IDENT@[170; 171) "X"
WHITESPACE@[171; 172) " "
FAT_ARROW@[172; 174) "=>"
WHITESPACE@[174; 175) " "
TUPLE_EXPR@[175; 177)
L_PAREN@[175; 176) "("
R_PAREN@[176; 177) ")"
COMMA@[177; 178) ","
WHITESPACE@[178; 187) "\n "
MATCH_ARM@[187; 204)
TUPLE_STRUCT_PAT@[187; 198)
PATH@[187; 191)
PATH_SEGMENT@[187; 191)
NAME_REF@[187; 191)
IDENT@[187; 191) "Some"
L_PAREN@[191; 192) "("
BIND_PAT@[192; 197)
BOX_KW@[192; 195) "box"
WHITESPACE@[195; 196) " "
NAME@[196; 197)
IDENT@[196; 197) "X"
R_PAREN@[197; 198) ")"
WHITESPACE@[198; 199) " "
FAT_ARROW@[199; 201) "=>"
WHITESPACE@[201; 202) " "
TUPLE_EXPR@[202; 204)
L_PAREN@[202; 203) "("
R_PAREN@[203; 204) ")"
COMMA@[204; 205) ","
WHITESPACE@[205; 210) "\n "
R_CURLY@[210; 211) "}"
SEMI@[211; 212) ";"
WHITESPACE@[212; 213) "\n"
R_CURLY@[213; 214) "}"
WHITESPACE@[214; 215) "\n"