Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 04:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clarify NameClass names a bit

Browse source
This commit is contained in:
Aleksey Kladov 2020-10-15 16:15:01 +02:00
parent 7fadc78ebb
commit fa3c449d8f
6 changed files with 7 additions and 7 deletions
Show stats 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(sema.db)), ast::Name(name) => classify_name(&sema, &name).map(|d| d.definition_or_reference(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(sema.db); let def = classify_name(&sema, &name)?.definition_or_reference(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/hover.rs
View file

@ -108,7 +108,7 @@ pub(crate) fn hover(
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).and_then(|d| d.into_definition(sema.db)), ast::Name(name) => classify_name(&sema, &name).and_then(|d| d.definition(sema.db)),
_ => None, _ => None,
} }
}; };

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(sema.db); let def = classify_name(sema, &name)?.definition_or_reference(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_db/src/defs.rs
View file

@ -90,7 +90,7 @@ pub enum NameClass {
} }
impl NameClass { impl NameClass {
pub fn into_definition(self, db: &dyn HirDatabase) -> Option<Definition> { pub fn definition(self, db: &dyn HirDatabase) -> Option<Definition> {
Some(match self { Some(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) => it, NameClass::Definition(it) => it,
@ -99,7 +99,7 @@ impl NameClass {
}) })
} }
pub fn definition(self, db: &dyn HirDatabase) -> Definition { pub fn definition_or_reference(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,

2
crates/ide_db/src/imports_locator.rs
View file

@ -60,5 +60,5 @@ fn get_name_definition<'a>(
candidate_node candidate_node
}; };
let name = ast::Name::cast(candidate_name_node)?; let name = ast::Name::cast(candidate_name_node)?;
classify_name(sema, &name)?.into_definition(sema.db) classify_name(sema, &name)?.definition(sema.db)
} }