squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Pickup ConstReference patterns in FindUsages

Browse source
This commit is contained in:
Lukas Wirth 2021-02-23 23:31:07 +01:00
parent a307e4f31f
commit 9e8f4d31a4
2 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
crates/ide/src/references.rs
View file

@ -1224,4 +1224,29 @@ fn test() {}
"#]],
);
}
#[test]
fn test_const_in_pattern() {
check(
r#"
const A$0: i32 = 42;
fn main() {
match A {
A => (),
_ => (),
}
if let A = A {}
}
"#,
expect![[r#"
A Const FileId(0) 0..18 6..7
FileId(0) 42..43
FileId(0) 54..55
FileId(0) 97..98
FileId(0) 101..102
"#]],
);
}
}

15
crates/ide_db/src/search.rs
View file

@ -416,10 +416,11 @@ impl<'a> FindUsages<'a> {
sink: &mut dyn FnMut(FileId, FileReference) -> bool,
) -> bool {
match NameClass::classify(self.sema, name) {
Some(NameClass::PatFieldShorthand { local_def: _, field_ref }) => {
if !matches!(self.def, Definition::Field(_) if &field_ref == self.def) {
return false;
}
Some(NameClass::PatFieldShorthand { local_def: _, field_ref })
if matches!(
self.def, Definition::Field(_) if &field_ref == self.def
) =>
{
let FileRange { file_id, range } = self.sema.original_range(name.syntax());
let reference = FileReference {
range,
@ -429,6 +430,12 @@ impl<'a> FindUsages<'a> {
};
sink(file_id, reference)
}
Some(NameClass::ConstReference(def)) if *self.def == def => {
let FileRange { file_id, range } = self.sema.original_range(name.syntax());
let reference =
FileReference { range, name: ast::NameLike::Name(name.clone()), access: None };
sink(file_id, reference)
}
_ => false, // not a usage
}
}