nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-23 21:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unconfuse expression and pattern field init shorthands

Browse Source
This commit is contained in:
Aleksey Kladov 2020-10-15 16:23:55 +02:00
parent fa3c449d8f
commit bc287b8f9b
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ide/src/syntax_highlighting.rs
View File

@ -459,7 +459,7 @@ fn highlight_element(
highlight_def(db, def) | HighlightModifier::Definition
}
Some(NameClass::ConstReference(def)) => highlight_def(db, def),
Some(NameClass::FieldShorthand { field, .. }) => {
Some(NameClass::PatFieldShorthand { field, .. }) => {
let mut h = HighlightTag::Field.into();
if let Definition::Field(field) = field {
if let VariantDef::Union(_) = field.parent_def(db) {

16
crates/ide_db/src/defs.rs
View File

@ -83,7 +83,8 @@ pub enum NameClass {
Definition(Definition),
/// `None` in `if let None = Some(82) {}`
ConstReference(Definition),
FieldShorthand {
/// `field` in `if let Foo { field } = todo!() {}`
PatFieldShorthand {
local: Local,
field: Definition,
},
@ -91,19 +92,22 @@ pub enum NameClass {
impl NameClass {
pub fn definition(self, db: &dyn HirDatabase) -> Option<Definition> {
Some(match self {
let res = match self {
NameClass::ExternCrate(krate) => Definition::ModuleDef(krate.root_module(db).into()),
NameClass::Definition(it) => it,
NameClass::ConstReference(_) => return None,
NameClass::FieldShorthand { local, field: _ } => Definition::Local(local),
})
/// Both `local` and `field` are definitions here, but only `local`
/// is the definition which is introduced by this name.
NameClass::PatFieldShorthand { local, field: _ } => Definition::Local(local),
};
Some(res)
}
pub fn definition_or_reference(self, db: &dyn HirDatabase) -> Definition {
match self {
NameClass::ExternCrate(krate) => Definition::ModuleDef(krate.root_module(db).into()),
NameClass::Definition(it) | NameClass::ConstReference(it) => it,
NameClass::FieldShorthand { local: _, field } => field,
NameClass::PatFieldShorthand { local: _, field } => field,
}
}
}
@ -161,7 +165,7 @@ pub fn classify_name(sema: &Semantics<RootDatabase>, name: &ast::Name) -> Option
if record_pat_field.name_ref().is_none() {
if let Some(field) = sema.resolve_record_pat_field(&record_pat_field) {
let field = Definition::Field(field);
return Some(NameClass::FieldShorthand { local, field });
return Some(NameClass::PatFieldShorthand { local, field });
}
}
}

2
crates/ide_db/src/search.rs
View File

@ -314,7 +314,7 @@ impl<'a> FindUsages<'a> {
fn found_name(&self, name: &ast::Name, sink: &mut dyn FnMut(Reference) -> bool) -> bool {
match classify_name(self.sema, name) {
Some(NameClass::FieldShorthand { local: _, field }) => {
Some(NameClass::PatFieldShorthand { local: _, field }) => {
let reference = match self.def {
Definition::Field(_) if &field == self.def => Reference {
file_range: self.sema.original_range(name.syntax()),