language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove dead code

Browse source
This commit is contained in:
Aleksey Kladov 2020-08-19 19:54:00 +02:00
parent f5b7540f38
commit eb7bb2cba0
1 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

40
crates/ide/src/syntax_highlighting.rs
View file

@ -484,9 +484,9 @@ fn highlight_element(
match name_kind { match name_kind {
Some(NameClass::ExternCrate(_)) => HighlightTag::Module.into(), Some(NameClass::ExternCrate(_)) => HighlightTag::Module.into(),
Some(NameClass::Definition(def)) => { Some(NameClass::Definition(def)) => {
highlight_def(sema, db, def, None) | HighlightModifier::Definition highlight_def(db, def) | HighlightModifier::Definition
} }
Some(NameClass::ConstReference(def)) => highlight_def(sema, db, def, None), Some(NameClass::ConstReference(def)) => highlight_def(db, def),
Some(NameClass::FieldShorthand { field, .. }) => { Some(NameClass::FieldShorthand { field, .. }) => {
let mut h = HighlightTag::Field.into(); let mut h = HighlightTag::Field.into();
if let Definition::Field(field) = field { if let Definition::Field(field) = field {
@ -520,7 +520,7 @@ fn highlight_element(
} }
}; };
let mut h = highlight_def(sema, db, def, Some(name_ref.clone())); let mut h = highlight_def(db, def);
if let Some(parent) = name_ref.syntax().parent() { if let Some(parent) = name_ref.syntax().parent() {
if matches!(parent.kind(), FIELD_EXPR | RECORD_PAT_FIELD) { if matches!(parent.kind(), FIELD_EXPR | RECORD_PAT_FIELD) {
@ -736,34 +736,24 @@ fn highlight_method_call(
Some(h) Some(h)
} }
fn highlight_def( fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
sema: &Semantics<RootDatabase>,
db: &RootDatabase,
def: Definition,
name_ref: Option<ast::NameRef>,
) -> Highlight {
match def { match def {
Definition::Macro(_) => HighlightTag::Macro, Definition::Macro(_) => HighlightTag::Macro,
Definition::Field(_) => HighlightTag::Field, Definition::Field(_) => HighlightTag::Field,
Definition::ModuleDef(def) => match def { Definition::ModuleDef(def) => match def {
hir::ModuleDef::Module(_) => HighlightTag::Module, hir::ModuleDef::Module(_) => HighlightTag::Module,
hir::ModuleDef::Function(func) => { hir::ModuleDef::Function(func) => {
return name_ref let mut h = HighlightTag::Function.into();
.and_then(|name_ref| highlight_func_by_name_ref(sema, &name_ref)) if func.is_unsafe(db) {
.unwrap_or_else(|| { h |= HighlightModifier::Unsafe;
let mut h = HighlightTag::Function.into(); }
if func.is_unsafe(db) { if let Some(self_param) = func.self_param(db) {
h |= HighlightModifier::Unsafe; match self_param.access(db) {
} hir::Access::Exclusive => h |= HighlightModifier::Mutable,
hir::Access::Shared | hir::Access::Owned => (),
match func.self_param(db) { }
None => h, }
Some(self_param) => match self_param.access(db) { return h;
hir::Access::Exclusive => h | HighlightModifier::Mutable,
hir::Access::Shared | hir::Access::Owned => h,
},
}
});
} }
hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HighlightTag::Struct, hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HighlightTag::Struct,
hir::ModuleDef::Adt(hir::Adt::Enum(_)) => HighlightTag::Enum, hir::ModuleDef::Adt(hir::Adt::Enum(_)) => HighlightTag::Enum,