diff options
Diffstat (limited to 'crates/ra_ide/src/syntax_highlighting.rs')
-rw-r--r-- | crates/ra_ide/src/syntax_highlighting.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs index 7e41db530..9e0ee2158 100644 --- a/crates/ra_ide/src/syntax_highlighting.rs +++ b/crates/ra_ide/src/syntax_highlighting.rs | |||
@@ -7,7 +7,7 @@ mod tests; | |||
7 | 7 | ||
8 | use hir::{Name, Semantics}; | 8 | use hir::{Name, Semantics}; |
9 | use ra_ide_db::{ | 9 | use ra_ide_db::{ |
10 | defs::{classify_name, NameClass, NameDefinition}, | 10 | defs::{classify_name, Definition, NameClass}, |
11 | RootDatabase, | 11 | RootDatabase, |
12 | }; | 12 | }; |
13 | use ra_prof::profile; | 13 | use ra_prof::profile; |
@@ -172,7 +172,7 @@ fn highlight_element( | |||
172 | let name = element.into_node().and_then(ast::Name::cast).unwrap(); | 172 | let name = element.into_node().and_then(ast::Name::cast).unwrap(); |
173 | let name_kind = classify_name(sema, &name); | 173 | let name_kind = classify_name(sema, &name); |
174 | 174 | ||
175 | if let Some(NameClass::NameDefinition(NameDefinition::Local(local))) = &name_kind { | 175 | if let Some(NameClass::Definition(Definition::Local(local))) = &name_kind { |
176 | if let Some(name) = local.name(db) { | 176 | if let Some(name) = local.name(db) { |
177 | let shadow_count = bindings_shadow_count.entry(name.clone()).or_default(); | 177 | let shadow_count = bindings_shadow_count.entry(name.clone()).or_default(); |
178 | *shadow_count += 1; | 178 | *shadow_count += 1; |
@@ -181,7 +181,7 @@ fn highlight_element( | |||
181 | }; | 181 | }; |
182 | 182 | ||
183 | match name_kind { | 183 | match name_kind { |
184 | Some(NameClass::NameDefinition(def)) => { | 184 | Some(NameClass::Definition(def)) => { |
185 | highlight_name(db, def) | HighlightModifier::Definition | 185 | highlight_name(db, def) | HighlightModifier::Definition |
186 | } | 186 | } |
187 | Some(NameClass::ConstReference(def)) => highlight_name(db, def), | 187 | Some(NameClass::ConstReference(def)) => highlight_name(db, def), |
@@ -196,8 +196,8 @@ fn highlight_element( | |||
196 | let name_kind = classify_name_ref(sema, &name_ref)?; | 196 | let name_kind = classify_name_ref(sema, &name_ref)?; |
197 | 197 | ||
198 | match name_kind { | 198 | match name_kind { |
199 | NameRefClass::NameDefinition(def) => { | 199 | NameRefClass::Definition(def) => { |
200 | if let NameDefinition::Local(local) = &def { | 200 | if let Definition::Local(local) = &def { |
201 | if let Some(name) = local.name(db) { | 201 | if let Some(name) = local.name(db) { |
202 | let shadow_count = | 202 | let shadow_count = |
203 | bindings_shadow_count.entry(name.clone()).or_default(); | 203 | bindings_shadow_count.entry(name.clone()).or_default(); |
@@ -260,11 +260,11 @@ fn highlight_element( | |||
260 | } | 260 | } |
261 | } | 261 | } |
262 | 262 | ||
263 | fn highlight_name(db: &RootDatabase, def: NameDefinition) -> Highlight { | 263 | fn highlight_name(db: &RootDatabase, def: Definition) -> Highlight { |
264 | match def { | 264 | match def { |
265 | NameDefinition::Macro(_) => HighlightTag::Macro, | 265 | Definition::Macro(_) => HighlightTag::Macro, |
266 | NameDefinition::StructField(_) => HighlightTag::Field, | 266 | Definition::StructField(_) => HighlightTag::Field, |
267 | NameDefinition::ModuleDef(def) => match def { | 267 | Definition::ModuleDef(def) => match def { |
268 | hir::ModuleDef::Module(_) => HighlightTag::Module, | 268 | hir::ModuleDef::Module(_) => HighlightTag::Module, |
269 | hir::ModuleDef::Function(_) => HighlightTag::Function, | 269 | hir::ModuleDef::Function(_) => HighlightTag::Function, |
270 | hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HighlightTag::Struct, | 270 | hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HighlightTag::Struct, |
@@ -277,10 +277,10 @@ fn highlight_name(db: &RootDatabase, def: NameDefinition) -> Highlight { | |||
277 | hir::ModuleDef::TypeAlias(_) => HighlightTag::TypeAlias, | 277 | hir::ModuleDef::TypeAlias(_) => HighlightTag::TypeAlias, |
278 | hir::ModuleDef::BuiltinType(_) => HighlightTag::BuiltinType, | 278 | hir::ModuleDef::BuiltinType(_) => HighlightTag::BuiltinType, |
279 | }, | 279 | }, |
280 | NameDefinition::SelfType(_) => HighlightTag::SelfType, | 280 | Definition::SelfType(_) => HighlightTag::SelfType, |
281 | NameDefinition::TypeParam(_) => HighlightTag::TypeParam, | 281 | Definition::TypeParam(_) => HighlightTag::TypeParam, |
282 | // FIXME: distinguish between locals and parameters | 282 | // FIXME: distinguish between locals and parameters |
283 | NameDefinition::Local(local) => { | 283 | Definition::Local(local) => { |
284 | let mut h = Highlight::new(HighlightTag::Local); | 284 | let mut h = Highlight::new(HighlightTag::Local); |
285 | if local.is_mut(db) || local.ty(db).is_mutable_reference() { | 285 | if local.is_mut(db) || local.ty(db).is_mutable_reference() { |
286 | h |= HighlightModifier::Mutable; | 286 | h |= HighlightModifier::Mutable; |