mirror of
https://github.com/rust-lang/rust.git
synced 2025-01-19 11:12:43 +00:00
Fix parser for macro call in pattern position
This commit is contained in:
parent
af5e2abe15
commit
4a7e19946a
@ -424,6 +424,42 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn goto_definition_works_for_macro_inside_pattern() {
|
||||
check_goto(
|
||||
"
|
||||
//- /lib.rs
|
||||
macro_rules! foo {() => {0}}
|
||||
|
||||
fn bar() {
|
||||
match (0,1) {
|
||||
(<|>foo!(), _) => {}
|
||||
}
|
||||
}
|
||||
",
|
||||
"foo MACRO_CALL FileId(1) [0; 28) [13; 16)",
|
||||
"macro_rules! foo {() => {0}}|foo",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn goto_definition_works_for_macro_inside_match_arm_lhs() {
|
||||
check_goto(
|
||||
"
|
||||
//- /lib.rs
|
||||
macro_rules! foo {() => {0}}
|
||||
|
||||
fn bar() {
|
||||
match 0 {
|
||||
<|>foo!() => {}
|
||||
}
|
||||
}
|
||||
",
|
||||
"foo MACRO_CALL FileId(1) [0; 28) [13; 16)",
|
||||
"macro_rules! foo {() => {0}}|foo",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn goto_def_for_methods() {
|
||||
covers!(goto_def_for_methods);
|
||||
|
@ -50,7 +50,7 @@ pub(super) fn pattern_r(p: &mut Parser, recovery_set: TokenSet) {
|
||||
// let m!(x) = 0;
|
||||
// }
|
||||
if lhs.kind() == PATH_PAT && p.at(T![!]) {
|
||||
let m = lhs.precede(p);
|
||||
let m = lhs.undo_completion(p);
|
||||
items::macro_call_after_excl(p);
|
||||
m.complete(p, MACRO_CALL);
|
||||
}
|
||||
|
@ -16,11 +16,10 @@ SOURCE_FILE@[0; 33)
|
||||
LET_KW@[16; 19) "let"
|
||||
WHITESPACE@[19; 20) " "
|
||||
MACRO_CALL@[20; 25)
|
||||
PATH_PAT@[20; 21)
|
||||
PATH@[20; 21)
|
||||
PATH_SEGMENT@[20; 21)
|
||||
NAME_REF@[20; 21)
|
||||
IDENT@[20; 21) "m"
|
||||
PATH@[20; 21)
|
||||
PATH_SEGMENT@[20; 21)
|
||||
NAME_REF@[20; 21)
|
||||
IDENT@[20; 21) "m"
|
||||
EXCL@[21; 22) "!"
|
||||
TOKEN_TREE@[22; 25)
|
||||
L_PAREN@[22; 23) "("
|
||||
|
Loading…
Reference in New Issue
Block a user