Skip to content

Commit 1996762

Browse files
bors[bot]matklad
bors[bot]
and
matklad
authored
Merge #3048
3048: Remove irrelevant distinction r=matklad a=matklad Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2 parents 8337dcd + ae70d07 commit 1996762

File tree

7 files changed

+45
-71
lines changed

7 files changed

+45
-71
lines changed

‎crates/ra_ide/src/goto_definition.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,10 @@ pub(crate) fn reference_definition(
7676
let name_kind = classify_name_ref(sb, name_ref).map(|d| d.kind);
7777
match name_kind {
7878
Some(Macro(it)) => return Exact(it.to_nav(sb.db)),
79-
Some(Field(it)) => return Exact(it.to_nav(sb.db)),
79+
Some(StructField(it)) => return Exact(it.to_nav(sb.db)),
8080
Some(TypeParam(it)) => return Exact(it.to_nav(sb.db)),
81-
Some(AssocItem(it)) => return Exact(it.to_nav(sb.db)),
8281
Some(Local(it)) => return Exact(it.to_nav(sb.db)),
83-
Some(Def(def)) => match NavigationTarget::from_def(sb.db, def) {
82+
Some(ModuleDef(def)) => match NavigationTarget::from_def(sb.db, def) {
8483
Some(nav) => return Exact(nav),
8584
None => return Approximate(vec![]),
8685
},

‎crates/ra_ide/src/hover.rs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,14 @@ fn hover_text_from_name_kind(db: &RootDatabase, name_kind: NameKind) -> Option<S
9898
let src = it.source(db);
9999
hover_text(src.value.doc_comment_text(), Some(macro_label(&src.value)))
100100
}
101-
Field(it) => {
101+
StructField(it) => {
102102
let src = it.source(db);
103103
match src.value {
104104
hir::FieldSource::Named(it) => hover_text(it.doc_comment_text(), it.short_label()),
105105
_ => None,
106106
}
107107
}
108-
AssocItem(it) => match it {
109-
hir::AssocItem::Function(it) => from_def_source(db, it),
110-
hir::AssocItem::Const(it) => from_def_source(db, it),
111-
hir::AssocItem::TypeAlias(it) => from_def_source(db, it),
112-
},
113-
Def(it) => match it {
108+
ModuleDef(it) => match it {
114109
hir::ModuleDef::Module(it) => match it.definition_source(db).value {
115110
hir::ModuleSource::Module(it) => {
116111
hover_text(it.doc_comment_text(), it.short_label())

‎crates/ra_ide/src/references.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,8 @@ pub(crate) fn find_all_refs(
127127

128128
let declaration = match def.kind {
129129
NameKind::Macro(mac) => mac.to_nav(db),
130-
NameKind::Field(field) => field.to_nav(db),
131-
NameKind::AssocItem(assoc) => assoc.to_nav(db),
132-
NameKind::Def(def) => NavigationTarget::from_def(db, def)?,
130+
NameKind::StructField(field) => field.to_nav(db),
131+
NameKind::ModuleDef(def) => NavigationTarget::from_def(db, def)?,
133132
NameKind::SelfType(imp) => imp.to_nav(db),
134133
NameKind::Local(local) => local.to_nav(db),
135134
NameKind::TypeParam(_) => return None,
@@ -240,7 +239,7 @@ fn decl_access(
240239
range: TextRange,
241240
) -> Option<ReferenceAccess> {
242241
match kind {
243-
NameKind::Local(_) | NameKind::Field(_) => {}
242+
NameKind::Local(_) | NameKind::StructField(_) => {}
244243
_ => return None,
245244
};
246245

@@ -260,7 +259,7 @@ fn decl_access(
260259
fn reference_access(kind: &NameKind, name_ref: &ast::NameRef) -> Option<ReferenceAccess> {
261260
// Only Locals and Fields have accesses for now.
262261
match kind {
263-
NameKind::Local(_) | NameKind::Field(_) => {}
262+
NameKind::Local(_) | NameKind::StructField(_) => {}
264263
_ => return None,
265264
};
266265

‎crates/ra_ide/src/references/classify.rs‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use test_utils::tested_by;
88
use super::{NameDefinition, NameKind};
99
use ra_ide_db::RootDatabase;
1010

11-
pub use ra_ide_db::defs::{classify_name, from_assoc_item, from_module_def, from_struct_field};
11+
pub use ra_ide_db::defs::{classify_name, from_module_def, from_struct_field};
1212

1313
pub(crate) fn classify_name_ref(
1414
sb: &mut SourceBinder<RootDatabase>,
@@ -22,7 +22,7 @@ pub(crate) fn classify_name_ref(
2222
if let Some(method_call) = ast::MethodCallExpr::cast(parent.clone()) {
2323
tested_by!(goto_def_for_methods);
2424
if let Some(func) = analyzer.resolve_method_call(&method_call) {
25-
return Some(from_assoc_item(sb.db, func.into()));
25+
return Some(from_module_def(sb.db, func.into(), None));
2626
}
2727
}
2828

@@ -57,27 +57,35 @@ pub(crate) fn classify_name_ref(
5757

5858
let path = name_ref.value.syntax().ancestors().find_map(ast::Path::cast)?;
5959
let resolved = analyzer.resolve_path(sb.db, &path)?;
60-
match resolved {
61-
PathResolution::Def(def) => Some(from_module_def(sb.db, def, Some(container))),
62-
PathResolution::AssocItem(item) => Some(from_assoc_item(sb.db, item)),
60+
let res = match resolved {
61+
PathResolution::Def(def) => from_module_def(sb.db, def, Some(container)),
62+
PathResolution::AssocItem(item) => {
63+
let def = match item {
64+
hir::AssocItem::Function(it) => it.into(),
65+
hir::AssocItem::Const(it) => it.into(),
66+
hir::AssocItem::TypeAlias(it) => it.into(),
67+
};
68+
from_module_def(sb.db, def, Some(container))
69+
}
6370
PathResolution::Local(local) => {
6471
let kind = NameKind::Local(local);
6572
let container = local.module(sb.db);
66-
Some(NameDefinition { kind, container, visibility: None })
73+
NameDefinition { kind, container, visibility: None }
6774
}
6875
PathResolution::TypeParam(par) => {
6976
let kind = NameKind::TypeParam(par);
7077
let container = par.module(sb.db);
71-
Some(NameDefinition { kind, container, visibility })
78+
NameDefinition { kind, container, visibility }
7279
}
7380
PathResolution::Macro(def) => {
7481
let kind = NameKind::Macro(def);
75-
Some(NameDefinition { kind, container, visibility })
82+
NameDefinition { kind, container, visibility }
7683
}
7784
PathResolution::SelfType(impl_block) => {
7885
let kind = NameKind::SelfType(impl_block);
7986
let container = impl_block.module(sb.db);
80-
Some(NameDefinition { kind, container, visibility })
87+
NameDefinition { kind, container, visibility }
8188
}
82-
}
89+
};
90+
Some(res)
8391
}

‎crates/ra_ide/src/syntax_highlighting.rs‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -320,19 +320,16 @@ pub(crate) fn highlight_as_html(db: &RootDatabase, file_id: FileId, rainbow: boo
320320
fn highlight_name(db: &RootDatabase, name_kind: NameKind) -> &'static str {
321321
match name_kind {
322322
Macro(_) => tags::MACRO,
323-
Field(_) => tags::FIELD,
324-
AssocItem(hir::AssocItem::Function(_)) => tags::FUNCTION,
325-
AssocItem(hir::AssocItem::Const(_)) => tags::CONSTANT,
326-
AssocItem(hir::AssocItem::TypeAlias(_)) => tags::TYPE,
327-
Def(hir::ModuleDef::Module(_)) => tags::MODULE,
328-
Def(hir::ModuleDef::Function(_)) => tags::FUNCTION,
329-
Def(hir::ModuleDef::Adt(_)) => tags::TYPE,
330-
Def(hir::ModuleDef::EnumVariant(_)) => tags::CONSTANT,
331-
Def(hir::ModuleDef::Const(_)) => tags::CONSTANT,
332-
Def(hir::ModuleDef::Static(_)) => tags::CONSTANT,
333-
Def(hir::ModuleDef::Trait(_)) => tags::TYPE,
334-
Def(hir::ModuleDef::TypeAlias(_)) => tags::TYPE,
335-
Def(hir::ModuleDef::BuiltinType(_)) => tags::TYPE_BUILTIN,
323+
StructField(_) => tags::FIELD,
324+
ModuleDef(hir::ModuleDef::Module(_)) => tags::MODULE,
325+
ModuleDef(hir::ModuleDef::Function(_)) => tags::FUNCTION,
326+
ModuleDef(hir::ModuleDef::Adt(_)) => tags::TYPE,
327+
ModuleDef(hir::ModuleDef::EnumVariant(_)) => tags::CONSTANT,
328+
ModuleDef(hir::ModuleDef::Const(_)) => tags::CONSTANT,
329+
ModuleDef(hir::ModuleDef::Static(_)) => tags::CONSTANT,
330+
ModuleDef(hir::ModuleDef::Trait(_)) => tags::TYPE,
331+
ModuleDef(hir::ModuleDef::TypeAlias(_)) => tags::TYPE,
332+
ModuleDef(hir::ModuleDef::BuiltinType(_)) => tags::TYPE_BUILTIN,
336333
SelfType(_) => tags::TYPE_SELF,
337334
TypeParam(_) => tags::TYPE_PARAM,
338335
Local(local) => {

‎crates/ra_ide_db/src/defs.rs‎

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// FIXME: this badly needs rename/rewrite (matklad, 2020-02-06).
77

88
use hir::{
9-
Adt, AssocItem, HasSource, ImplBlock, InFile, Local, MacroDef, Module, ModuleDef, SourceBinder,
9+
Adt, HasSource, ImplBlock, InFile, Local, MacroDef, Module, ModuleDef, SourceBinder,
1010
StructField, TypeParam, VariantDef,
1111
};
1212
use ra_prof::profile;
@@ -20,9 +20,8 @@ use crate::RootDatabase;
2020
#[derive(Debug, PartialEq, Eq)]
2121
pub enum NameKind {
2222
Macro(MacroDef),
23-
Field(StructField),
24-
AssocItem(AssocItem),
25-
Def(ModuleDef),
23+
StructField(StructField),
24+
ModuleDef(ModuleDef),
2625
SelfType(ImplBlock),
2726
Local(Local),
2827
TypeParam(TypeParam),
@@ -92,29 +91,17 @@ pub fn classify_name(
9291
ast::FnDef(it) => {
9392
let src = name.with_value(it);
9493
let def: hir::Function = sb.to_def(src)?;
95-
if parent.parent().and_then(ast::ItemList::cast).map_or(false, |it| it.syntax().parent().and_then(ast::Module::cast).is_none()) {
96-
Some(from_assoc_item(sb.db, def.into()))
97-
} else {
98-
Some(from_module_def(sb.db, def.into(), None))
99-
}
94+
Some(from_module_def(sb.db, def.into(), None))
10095
},
10196
ast::ConstDef(it) => {
10297
let src = name.with_value(it);
10398
let def: hir::Const = sb.to_def(src)?;
104-
if parent.parent().and_then(ast::ItemList::cast).is_some() {
105-
Some(from_assoc_item(sb.db, def.into()))
106-
} else {
107-
Some(from_module_def(sb.db, def.into(), None))
108-
}
99+
Some(from_module_def(sb.db, def.into(), None))
109100
},
110101
ast::TypeAliasDef(it) => {
111102
let src = name.with_value(it);
112103
let def: hir::TypeAlias = sb.to_def(src)?;
113-
if parent.parent().and_then(ast::ItemList::cast).is_some() {
114-
Some(from_assoc_item(sb.db, def.into()))
115-
} else {
116-
Some(from_module_def(sb.db, def.into(), None))
117-
}
104+
Some(from_module_def(sb.db, def.into(), None))
118105
},
119106
ast::MacroCall(it) => {
120107
let src = name.with_value(it);
@@ -142,19 +129,8 @@ pub fn classify_name(
142129
}
143130
}
144131

145-
pub fn from_assoc_item(db: &RootDatabase, item: AssocItem) -> NameDefinition {
146-
let container = item.module(db);
147-
let visibility = match item {
148-
AssocItem::Function(f) => f.source(db).value.visibility(),
149-
AssocItem::Const(c) => c.source(db).value.visibility(),
150-
AssocItem::TypeAlias(a) => a.source(db).value.visibility(),
151-
};
152-
let kind = NameKind::AssocItem(item);
153-
NameDefinition { kind, container, visibility }
154-
}
155-
156132
pub fn from_struct_field(db: &RootDatabase, field: StructField) -> NameDefinition {
157-
let kind = NameKind::Field(field);
133+
let kind = NameKind::StructField(field);
158134
let parent = field.parent_def(db);
159135
let container = parent.module(db);
160136
let visibility = match parent {
@@ -170,7 +146,7 @@ pub fn from_module_def(
170146
def: ModuleDef,
171147
module: Option<Module>,
172148
) -> NameDefinition {
173-
let kind = NameKind::Def(def);
149+
let kind = NameKind::ModuleDef(def);
174150
let (container, visibility) = match def {
175151
ModuleDef::Module(it) => {
176152
let container = it.parent(db).or_else(|| Some(it)).unwrap();

‎crates/ra_ide_db/src/imports_locator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl<'a> ImportsLocator<'a> {
4444
.chain(lib_results.into_iter())
4545
.filter_map(|import_candidate| self.get_name_definition(db, &import_candidate))
4646
.filter_map(|name_definition_to_import| match name_definition_to_import {
47-
NameKind::Def(module_def) => Some(module_def),
47+
NameKind::ModuleDef(module_def) => Some(module_def),
4848
_ => None,
4949
})
5050
.collect()

0 commit comments

Comments
 (0)