Handle self/super/crate in PathSegment as NameRef

1 files changed, 11 insertions, 28 deletions

diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs
index 34bae49a8..87578e70a 100644
--- a/crates/ide/src/syntax_highlighting/highlight.rs
+++ b/crates/ide/src/syntax_highlighting/highlight.rs
@@ -226,35 +226,16 @@ pub(super) fn element(
                 T![unsafe] => h | HlMod::Unsafe,
                 T![true] | T![false] => HlTag::BoolLiteral.into(),
                 T![self] => {
-                    let self_param_is_mut = element
-                        .parent()
-                        .and_then(ast::SelfParam::cast)
-                        .and_then(|p| p.mut_token())
-                        .is_some();
-                    let self_path = &element
-                        .parent()
-                        .as_ref()
-                        .and_then(SyntaxNode::parent)
-                        .and_then(ast::Path::cast)
-                        .and_then(|p| sema.resolve_path(&p));
-                    let mut h = HlTag::Symbol(SymbolKind::SelfParam).into();
-                    if self_param_is_mut
-                        || matches!(self_path,
-                            Some(hir::PathResolution::Local(local))
-                                if local.is_self(db)
-                                    && (local.is_mut(db) || local.ty(db).is_mutable_reference())
-                        )
+                    let self_param = element.parent().and_then(ast::SelfParam::cast);
+                    if let Some(NameClass::Definition(def)) = self_param
+                        .and_then(|self_param| NameClass::classify_self_param(sema, &self_param))
                     {
-                        h |= HlMod::Mutable
-                    }
-
-                    if let Some(hir::PathResolution::Local(local)) = self_path {
-                        if is_consumed_lvalue(element, &local, db) {
-                            h |= HlMod::Consuming;
-                        }
+                        highlight_def(db, def) | HlMod::Definition
+                    } else if element.ancestors().any(|it| it.kind() == USE_TREE) {
+                        HlTag::Symbol(SymbolKind::SelfParam).into()
+                    } else {
+                        return None;
                     }
-
-                    h
                 }
                 T![ref] => element
                     .parent()
@@ -345,7 +326,9 @@ fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
             hir::GenericParam::LifetimeParam(_) => HlTag::Symbol(SymbolKind::LifetimeParam),
         },
         Definition::Local(local) => {
-            let tag = if local.is_param(db) {
+            let tag = if local.is_self(db) {
+                HlTag::Symbol(SymbolKind::SelfParam)
+            } else if local.is_param(db) {
                 HlTag::Symbol(SymbolKind::ValueParam)
             } else {
                 HlTag::Symbol(SymbolKind::Local)