language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rename

Browse source
This commit is contained in:
Aleksey Kladov 2020-02-07 14:26:59 +01:00
parent f55be75a17
commit ae70d07237
6 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_ide/src/goto_definition.rs
View file

@ -76,10 +76,10 @@ pub(crate) fn reference_definition(
let name_kind = classify_name_ref(sb, name_ref).map(|d| d.kind);
match name_kind {
Some(Macro(it)) => return Exact(it.to_nav(sb.db)),
Some(Field(it)) => return Exact(it.to_nav(sb.db)),
Some(StructField(it)) => return Exact(it.to_nav(sb.db)),
Some(TypeParam(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(ModuleDef(def)) => match NavigationTarget::from_def(sb.db, def) {
Some(nav) => return Exact(nav),
None => return Approximate(vec![]),
},

4
crates/ra_ide/src/hover.rs
View file

@ -98,14 +98,14 @@ fn hover_text_from_name_kind(db: &RootDatabase, name_kind: NameKind) -> Option<S
let src = it.source(db);
hover_text(src.value.doc_comment_text(), Some(macro_label(&src.value)))
}
Field(it) => {
StructField(it) => {
let src = it.source(db);
match src.value {
hir::FieldSource::Named(it) => hover_text(it.doc_comment_text(), it.short_label()),
_ => None,
}
}
Def(it) => match it {
ModuleDef(it) => match it {
hir::ModuleDef::Module(it) => match it.definition_source(db).value {
hir::ModuleSource::Module(it) => {
hover_text(it.doc_comment_text(), it.short_label())

8
crates/ra_ide/src/references.rs
View file

@ -127,8 +127,8 @@ 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::Def(def) => NavigationTarget::from_def(db, def)?,
NameKind::StructField(field) => field.to_nav(db),
NameKind::ModuleDef(def) => NavigationTarget::from_def(db, def)?,
NameKind::SelfType(imp) => imp.to_nav(db),
NameKind::Local(local) => local.to_nav(db),
NameKind::TypeParam(_) => return None,
@ -239,7 +239,7 @@ fn decl_access(
range: TextRange,
) -> Option<ReferenceAccess> {
match kind {
NameKind::Local(_) | NameKind::Field(_) => {}
NameKind::Local(_) | NameKind::StructField(_) => {}
_ => return None,
};
@ -259,7 +259,7 @@ fn decl_access(
fn reference_access(kind: &NameKind, name_ref: &ast::NameRef) -> Option<ReferenceAccess> {
// Only Locals and Fields have accesses for now.
match kind {
NameKind::Local(_) | NameKind::Field(_) => {}
NameKind::Local(_) | NameKind::StructField(_) => {}
_ => return None,
};

20
crates/ra_ide/src/syntax_highlighting.rs
View file

@ -320,16 +320,16 @@ pub(crate) fn highlight_as_html(db: &RootDatabase, file_id: FileId, rainbow: boo
fn highlight_name(db: &RootDatabase, name_kind: NameKind) -> &'static str {
match name_kind {
Macro(_) => tags::MACRO,
Field(_) => tags::FIELD,
Def(hir::ModuleDef::Module(_)) => tags::MODULE,
Def(hir::ModuleDef::Function(_)) => tags::FUNCTION,
Def(hir::ModuleDef::Adt(_)) => tags::TYPE,
Def(hir::ModuleDef::EnumVariant(_)) => tags::CONSTANT,
Def(hir::ModuleDef::Const(_)) => tags::CONSTANT,
Def(hir::ModuleDef::Static(_)) => tags::CONSTANT,
Def(hir::ModuleDef::Trait(_)) => tags::TYPE,
Def(hir::ModuleDef::TypeAlias(_)) => tags::TYPE,
Def(hir::ModuleDef::BuiltinType(_)) => tags::TYPE_BUILTIN,
StructField(_) => tags::FIELD,
ModuleDef(hir::ModuleDef::Module(_)) => tags::MODULE,
ModuleDef(hir::ModuleDef::Function(_)) => tags::FUNCTION,
ModuleDef(hir::ModuleDef::Adt(_)) => tags::TYPE,
ModuleDef(hir::ModuleDef::EnumVariant(_)) => tags::CONSTANT,
ModuleDef(hir::ModuleDef::Const(_)) => tags::CONSTANT,
ModuleDef(hir::ModuleDef::Static(_)) => tags::CONSTANT,
ModuleDef(hir::ModuleDef::Trait(_)) => tags::TYPE,
ModuleDef(hir::ModuleDef::TypeAlias(_)) => tags::TYPE,
ModuleDef(hir::ModuleDef::BuiltinType(_)) => tags::TYPE_BUILTIN,
SelfType(_) => tags::TYPE_SELF,
TypeParam(_) => tags::TYPE_PARAM,
Local(local) => {

8
crates/ra_ide_db/src/defs.rs
View file

@ -20,8 +20,8 @@ use crate::RootDatabase;
#[derive(Debug, PartialEq, Eq)]
pub enum NameKind {
Macro(MacroDef),
Field(StructField),
Def(ModuleDef),
StructField(StructField),
ModuleDef(ModuleDef),
SelfType(ImplBlock),
Local(Local),
TypeParam(TypeParam),
@ -130,7 +130,7 @@ pub fn classify_name(
}
pub fn from_struct_field(db: &RootDatabase, field: StructField) -> NameDefinition {
let kind = NameKind::Field(field);
let kind = NameKind::StructField(field);
let parent = field.parent_def(db);
let container = parent.module(db);
let visibility = match parent {
@ -146,7 +146,7 @@ pub fn from_module_def(
def: ModuleDef,
module: Option<Module>,
) -> NameDefinition {
let kind = NameKind::Def(def);
let kind = NameKind::ModuleDef(def);
let (container, visibility) = match def {
ModuleDef::Module(it) => {
let container = it.parent(db).or_else(|| Some(it)).unwrap();

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

@ -44,7 +44,7 @@ impl<'a> ImportsLocator<'a> {
.chain(lib_results.into_iter())
.filter_map(|import_candidate| self.get_name_definition(db, &import_candidate))
.filter_map(|name_definition_to_import| match name_definition_to_import {
NameKind::Def(module_def) => Some(module_def),
NameKind::ModuleDef(module_def) => Some(module_def),
_ => None,
})
.collect()