nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove irrelevant distinction

Browse Source
This commit is contained in:
Aleksey Kladov 2020-02-07 12:51:12 +01:00
parent 4d0d113c7d
commit f55be75a17
6 changed files with 22 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/ra_ide/src/goto_definition.rs
View File

@ -78,7 +78,6 @@ pub(crate) fn reference_definition(
Some(Macro(it)) => return Exact(it.to_nav(sb.db)),
Some(Field(it)) => return Exact(it.to_nav(sb.db)),
Some(TypeParam(it)) => return Exact(it.to_nav(sb.db)),
Some(AssocItem(it)) => return Exact(it.to_nav(sb.db)),
Some(Local(it)) => return Exact(it.to_nav(sb.db)),
Some(Def(def)) => match NavigationTarget::from_def(sb.db, def) {
Some(nav) => return Exact(nav),

5
crates/ra_ide/src/hover.rs
View File

@ -105,11 +105,6 @@ fn hover_text_from_name_kind(db: &RootDatabase, name_kind: NameKind) -> Option<S
_ => None,
}
}
AssocItem(it) => match it {
hir::AssocItem::Function(it) => from_def_source(db, it),
hir::AssocItem::Const(it) => from_def_source(db, it),
hir::AssocItem::TypeAlias(it) => from_def_source(db, it),
},
Def(it) => match it {
hir::ModuleDef::Module(it) => match it.definition_source(db).value {
hir::ModuleSource::Module(it) => {

1
crates/ra_ide/src/references.rs
View File

@ -128,7 +128,6 @@ pub(crate) fn find_all_refs(
let declaration = match def.kind {
NameKind::Macro(mac) => mac.to_nav(db),
NameKind::Field(field) => field.to_nav(db),
NameKind::AssocItem(assoc) => assoc.to_nav(db),
NameKind::Def(def) => NavigationTarget::from_def(db, def)?,
NameKind::SelfType(imp) => imp.to_nav(db),
NameKind::Local(local) => local.to_nav(db),

28
crates/ra_ide/src/references/classify.rs
View File

@ -8,7 +8,7 @@ use test_utils::tested_by;
use super::{NameDefinition, NameKind};
use ra_ide_db::RootDatabase;
pub use ra_ide_db::defs::{classify_name, from_assoc_item, from_module_def, from_struct_field};
pub use ra_ide_db::defs::{classify_name, from_module_def, from_struct_field};
pub(crate) fn classify_name_ref(
sb: &mut SourceBinder<RootDatabase>,
@ -22,7 +22,7 @@ pub(crate) fn classify_name_ref(
if let Some(method_call) = ast::MethodCallExpr::cast(parent.clone()) {
tested_by!(goto_def_for_methods);
if let Some(func) = analyzer.resolve_method_call(&method_call) {
return Some(from_assoc_item(sb.db, func.into()));
return Some(from_module_def(sb.db, func.into(), None));
}
}
@ -57,27 +57,35 @@ pub(crate) fn classify_name_ref(
let path = name_ref.value.syntax().ancestors().find_map(ast::Path::cast)?;
let resolved = analyzer.resolve_path(sb.db, &path)?;
match resolved {
PathResolution::Def(def) => Some(from_module_def(sb.db, def, Some(container))),
PathResolution::AssocItem(item) => Some(from_assoc_item(sb.db, item)),
let res = match resolved {
PathResolution::Def(def) => from_module_def(sb.db, def, Some(container)),
PathResolution::AssocItem(item) => {
let def = match item {
hir::AssocItem::Function(it) => it.into(),
hir::AssocItem::Const(it) => it.into(),
hir::AssocItem::TypeAlias(it) => it.into(),
};
from_module_def(sb.db, def, Some(container))
}
PathResolution::Local(local) => {
let kind = NameKind::Local(local);
let container = local.module(sb.db);
Some(NameDefinition { kind, container, visibility: None })
NameDefinition { kind, container, visibility: None }
}
PathResolution::TypeParam(par) => {
let kind = NameKind::TypeParam(par);
let container = par.module(sb.db);
Some(NameDefinition { kind, container, visibility })
NameDefinition { kind, container, visibility }
}
PathResolution::Macro(def) => {
let kind = NameKind::Macro(def);
Some(NameDefinition { kind, container, visibility })
NameDefinition { kind, container, visibility }
}
PathResolution::SelfType(impl_block) => {
let kind = NameKind::SelfType(impl_block);
let container = impl_block.module(sb.db);
Some(NameDefinition { kind, container, visibility })
NameDefinition { kind, container, visibility }
}
}
};
Some(res)
}

3
crates/ra_ide/src/syntax_highlighting.rs
View File

@ -321,9 +321,6 @@ fn highlight_name(db: &RootDatabase, name_kind: NameKind) -> &'static str {
match name_kind {
Macro(_) => tags::MACRO,
Field(_) => tags::FIELD,
AssocItem(hir::AssocItem::Function(_)) => tags::FUNCTION,
AssocItem(hir::AssocItem::Const(_)) => tags::CONSTANT,
AssocItem(hir::AssocItem::TypeAlias(_)) => tags::TYPE,
Def(hir::ModuleDef::Module(_)) => tags::MODULE,
Def(hir::ModuleDef::Function(_)) => tags::FUNCTION,
Def(hir::ModuleDef::Adt(_)) => tags::TYPE,

32
crates/ra_ide_db/src/defs.rs
View File

@ -6,7 +6,7 @@
// FIXME: this badly needs rename/rewrite (matklad, 2020-02-06).
use hir::{
Adt, AssocItem, HasSource, ImplBlock, InFile, Local, MacroDef, Module, ModuleDef, SourceBinder,
Adt, HasSource, ImplBlock, InFile, Local, MacroDef, Module, ModuleDef, SourceBinder,
StructField, TypeParam, VariantDef,
};
use ra_prof::profile;
@ -21,7 +21,6 @@ use crate::RootDatabase;
pub enum NameKind {
Macro(MacroDef),
Field(StructField),
AssocItem(AssocItem),
Def(ModuleDef),
SelfType(ImplBlock),
Local(Local),
@ -92,29 +91,17 @@ pub fn classify_name(
ast::FnDef(it) => {
let src = name.with_value(it);
let def: hir::Function = sb.to_def(src)?;
if parent.parent().and_then(ast::ItemList::cast).map_or(false, |it| it.syntax().parent().and_then(ast::Module::cast).is_none()) {
Some(from_assoc_item(sb.db, def.into()))
} else {
Some(from_module_def(sb.db, def.into(), None))
}
Some(from_module_def(sb.db, def.into(), None))
},
ast::ConstDef(it) => {
let src = name.with_value(it);
let def: hir::Const = sb.to_def(src)?;
if parent.parent().and_then(ast::ItemList::cast).is_some() {
Some(from_assoc_item(sb.db, def.into()))
} else {
Some(from_module_def(sb.db, def.into(), None))
}
Some(from_module_def(sb.db, def.into(), None))
},
ast::TypeAliasDef(it) => {
let src = name.with_value(it);
let def: hir::TypeAlias = sb.to_def(src)?;
if parent.parent().and_then(ast::ItemList::cast).is_some() {
Some(from_assoc_item(sb.db, def.into()))
} else {
Some(from_module_def(sb.db, def.into(), None))
}
Some(from_module_def(sb.db, def.into(), None))
},
ast::MacroCall(it) => {
let src = name.with_value(it);
@ -142,17 +129,6 @@ pub fn classify_name(
}
}
pub fn from_assoc_item(db: &RootDatabase, item: AssocItem) -> NameDefinition {
let container = item.module(db);
let visibility = match item {
AssocItem::Function(f) => f.source(db).value.visibility(),
AssocItem::Const(c) => c.source(db).value.visibility(),
AssocItem::TypeAlias(a) => a.source(db).value.visibility(),
};
let kind = NameKind::AssocItem(item);
NameDefinition { kind, container, visibility }
}
pub fn from_struct_field(db: &RootDatabase, field: StructField) -> NameDefinition {
let kind = NameKind::Field(field);
let parent = field.parent_def(db);