itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better name

Browse Source
This commit is contained in:
Aleksey Kladov 2020-08-19 17:30:43 +02:00
parent a4b7ce94ba
commit 5da1dc9a8b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ide/src/syntax_highlighting.rs
View File

@ -496,9 +496,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_name(sema, db, def, None, false) | HighlightModifier::Definition highlight_def(sema, db, def, None, false) | HighlightModifier::Definition
} }
Some(NameClass::ConstReference(def)) => highlight_name(sema, db, def, None, false), Some(NameClass::ConstReference(def)) => highlight_def(sema, db, def, None, false),
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 {
@ -532,7 +532,7 @@ fn highlight_element(
binding_hash = Some(calc_binding_hash(&name, *shadow_count)) binding_hash = Some(calc_binding_hash(&name, *shadow_count))
} }
}; };
highlight_name(sema, db, def, Some(name_ref), possibly_unsafe) highlight_def(sema, db, def, Some(name_ref), possibly_unsafe)
} }
NameRefClass::FieldShorthand { .. } => HighlightTag::Field.into(), NameRefClass::FieldShorthand { .. } => HighlightTag::Field.into(),
}, },
@ -737,7 +737,7 @@ fn highlight_method_call(
Some(h) Some(h)
} }
fn highlight_name( fn highlight_def(
sema: &Semantics<RootDatabase>, sema: &Semantics<RootDatabase>,
db: &RootDatabase, db: &RootDatabase,
def: Definition, def: Definition,