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

More clarifications

Browse source
This commit is contained in:
Aleksey Kladov 2020-10-15 17:18:07 +02:00
parent bc287b8f9b
commit f9c1336873
6 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ide/src/doc_links.rs
View file

@ -233,7 +233,7 @@ pub(crate) fn external_docs(
let definition = match_ast! { let definition = match_ast! {
match node { match node {
ast::NameRef(name_ref) => classify_name_ref(&sema, &name_ref).map(|d| d.definition(sema.db)), ast::NameRef(name_ref) => classify_name_ref(&sema, &name_ref).map(|d| d.definition(sema.db)),
ast::Name(name) => classify_name(&sema, &name).map(|d| d.definition_or_reference(sema.db)), ast::Name(name) => classify_name(&sema, &name).map(|d| d.reference_or_definition(sema.db)),
_ => None, _ => None,
} }
}; };

2
crates/ide/src/goto_definition.rs
View file

@ -40,7 +40,7 @@ pub(crate) fn goto_definition(
reference_definition(&sema, &name_ref).to_vec() reference_definition(&sema, &name_ref).to_vec()
}, },
ast::Name(name) => { ast::Name(name) => {
let def = classify_name(&sema, &name)?.definition_or_reference(sema.db); let def = classify_name(&sema, &name)?.reference_or_definition(sema.db);
let nav = def.try_to_nav(sema.db)?; let nav = def.try_to_nav(sema.db)?;
vec![nav] vec![nav]
}, },

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

@ -132,7 +132,7 @@ fn find_name(
opt_name: Option<ast::Name>, opt_name: Option<ast::Name>,
) -> Option<RangeInfo<Definition>> { ) -> Option<RangeInfo<Definition>> {
if let Some(name) = opt_name { if let Some(name) = opt_name {
let def = classify_name(sema, &name)?.definition_or_reference(sema.db); let def = classify_name(sema, &name)?.reference_or_definition(sema.db);
let range = name.syntax().text_range(); let range = name.syntax().text_range();
return Some(RangeInfo::new(range, def)); return Some(RangeInfo::new(range, def));
} }

4
crates/ide/src/syntax_highlighting.rs
View file

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

20
crates/ide_db/src/defs.rs
View file

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

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

@ -314,9 +314,9 @@ impl<'a> FindUsages<'a> {
fn found_name(&self, name: &ast::Name, sink: &mut dyn FnMut(Reference) -> bool) -> bool { fn found_name(&self, name: &ast::Name, sink: &mut dyn FnMut(Reference) -> bool) -> bool {
match classify_name(self.sema, name) { match classify_name(self.sema, name) {
Some(NameClass::PatFieldShorthand { local: _, field }) => { Some(NameClass::PatFieldShorthand { local_def: _, field_ref }) => {
let reference = match self.def { let reference = match self.def {
Definition::Field(_) if &field == self.def => Reference { Definition::Field(_) if &field_ref == self.def => Reference {
file_range: self.sema.original_range(name.syntax()), file_range: self.sema.original_range(name.syntax()),
kind: ReferenceKind::FieldShorthandForField, kind: ReferenceKind::FieldShorthandForField,
// FIXME: mutable patterns should have `Write` access // FIXME: mutable patterns should have `Write` access