From f9c1336873d65805ad34129939d800dbf59daf61 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 15 Oct 2020 17:18:07 +0200
Subject: [PATCH] More clarifications
---
crates/ide/src/doc_links.rs | 2 +-
crates/ide/src/goto_definition.rs | 2 +-
crates/ide/src/references.rs | 2 +-
crates/ide/src/syntax_highlighting.rs | 4 ++--
crates/ide_db/src/defs.rs | 20 ++++++++++----------
crates/ide_db/src/search.rs | 4 ++--
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index 71382f13e10..5e414736236 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs
@@ -233,7 +233,7 @@ pub(crate) fn external_docs(
let definition = match_ast! {
match node {
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,
}
};
diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs
index 79fdb75eda0..be2f81aabc7 100644
--- a/crates/ide/src/goto_definition.rs
+++ b/crates/ide/src/goto_definition.rs
@@ -40,7 +40,7 @@ pub(crate) fn goto_definition(
reference_definition(&sema, &name_ref).to_vec()
},
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)?;
vec![nav]
},
diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs
index ec64207d23e..95d872b832a 100644
--- a/crates/ide/src/references.rs
+++ b/crates/ide/src/references.rs
@@ -132,7 +132,7 @@ fn find_name(
opt_name: Option<ast::Name>,
) -> Option<RangeInfo<Definition>> {
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();
return Some(RangeInfo::new(range, def));
}
diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs
index 4d8cd98c74c..928f771a946 100644
--- a/crates/ide/src/syntax_highlighting.rs
+++ b/crates/ide/src/syntax_highlighting.rs
@@ -459,9 +459,9 @@ fn highlight_element(
highlight_def(db, def) | HighlightModifier::Definition
}
Some(NameClass::ConstReference(def)) => highlight_def(db, def),
- Some(NameClass::PatFieldShorthand { field, .. }) => {
+ Some(NameClass::PatFieldShorthand { field_ref, .. }) => {
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) {
h |= HighlightModifier::Unsafe;
}
diff --git a/crates/ide_db/src/defs.rs b/crates/ide_db/src/defs.rs
index a2682d73ceb..717581593b8 100644
--- a/crates/ide_db/src/defs.rs
+++ b/crates/ide_db/src/defs.rs
@@ -81,12 +81,12 @@ impl Definition {
pub enum NameClass {
ExternCrate(Crate),
Definition(Definition),
- /// `None` in `if let None = Some(82) {}`
+ /// `None` in `if let None = Some(82) {}`.
ConstReference(Definition),
- /// `field` in `if let Foo { field } = todo!() {}`
+ /// `field` in `if let Foo { field } = foo`.
PatFieldShorthand {
- local: Local,
- field: Definition,
+ local_def: Local,
+ field_ref: Definition,
},
}
@@ -96,18 +96,18 @@ impl NameClass {
NameClass::ExternCrate(krate) => Definition::ModuleDef(krate.root_module(db).into()),
NameClass::Definition(it) => it,
NameClass::ConstReference(_) => return None,
- /// 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),
+ NameClass::PatFieldShorthand { local_def, field_ref: _ } => {
+ Definition::Local(local_def)
+ }
};
Some(res)
}
- pub fn definition_or_reference(self, db: &dyn HirDatabase) -> Definition {
+ pub fn reference_or_definition(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::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 let Some(field) = sema.resolve_record_pat_field(&record_pat_field) {
let field = Definition::Field(field);
- return Some(NameClass::PatFieldShorthand { local, field });
+ return Some(NameClass::PatFieldShorthand { local_def: local, field_ref: field });
}
}
}
diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index 43b8560ca14..8048aa62162 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -314,9 +314,9 @@ 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::PatFieldShorthand { local: _, field }) => {
+ Some(NameClass::PatFieldShorthand { local_def: _, field_ref }) => {
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()),
kind: ReferenceKind::FieldShorthandForField,
// FIXME: mutable patterns should have `Write` access