use hir::{AsAssocItem, HasVisibility, Semantics};
use ide_db::{
- defs::{Definition, NameClass, NameRefClass},
- helpers::{try_resolve_derive_input, FamousDefs},
+ defs::{Definition, IdentClass, NameClass, NameRefClass},
+ famous_defs::FamousDefs,
RootDatabase, SymbolKind,
};
use rustc_hash::FxHashMap;
Highlight, HlMod, HlTag,
};
-pub(super) fn token(
- sema: &Semantics<RootDatabase>,
- krate: Option<hir::Crate>,
- token: SyntaxToken,
-) -> Option<Highlight> {
+pub(super) fn token(sema: &Semantics<RootDatabase>, token: SyntaxToken) -> Option<Highlight> {
if let Some(comment) = ast::Comment::cast(token.clone()) {
let h = HlTag::Comment;
return Some(match comment.kind().doc {
INT_NUMBER | FLOAT_NUMBER => HlTag::NumericLiteral.into(),
BYTE => HlTag::ByteLiteral.into(),
CHAR => HlTag::CharLiteral.into(),
- IDENT if parent_matches::<ast::TokenTree>(&token) => {
- match token.ancestors().nth(2).and_then(ast::Attr::cast) {
- Some(attr) => {
- match try_resolve_derive_input(sema, &attr, &ast::Ident::cast(token).unwrap()) {
- Some(res) => highlight_def(sema, krate, Definition::from(res)),
- None => HlTag::None.into(),
- }
- }
- None => HlTag::None.into(),
- }
+ IDENT if token.parent().and_then(ast::TokenTree::cast).is_some() => {
+ // from this point on we are inside a token tree, this only happens for identifiers
+ // that were not mapped down into macro invocations
+ HlTag::None.into()
}
p if p.is_punct() => punctuation(sema, token, p),
k if k.is_keyword() => keyword(sema, token, k)?,
Some(highlight)
}
-pub(super) fn node(
+pub(super) fn name_like(
sema: &Semantics<RootDatabase>,
krate: Option<hir::Crate>,
bindings_shadow_count: &mut FxHashMap<hir::Name, u32>,
syntactic_name_ref_highlighting: bool,
- node: SyntaxNode,
+ name_like: ast::NameLike,
) -> Option<(Highlight, Option<u64>)> {
let mut binding_hash = None;
- let highlight = match_ast! {
- match node {
- ast::NameRef(name_ref) => {
- highlight_name_ref(
- sema,
- krate,
- bindings_shadow_count,
- &mut binding_hash,
- syntactic_name_ref_highlighting,
- name_ref,
- )
- },
- ast::Name(name) => {
- highlight_name(sema, bindings_shadow_count, &mut binding_hash, krate, name)
- },
- ast::Lifetime(lifetime) => {
- match NameClass::classify_lifetime(sema, &lifetime) {
- Some(NameClass::Definition(def)) => {
- highlight_def(sema, krate, def) | HlMod::Definition
- }
- None => match NameRefClass::classify_lifetime(sema, &lifetime) {
- Some(NameRefClass::Definition(def)) => highlight_def(sema, krate, def),
- _ => SymbolKind::LifetimeParam.into(),
- },
- _ => Highlight::from(SymbolKind::LifetimeParam) | HlMod::Definition,
- }
- },
- ast::Fn(_) => {
- bindings_shadow_count.clear();
- return None;
- },
- _ => {
- if [FN, CONST, STATIC].contains(&node.kind()) {
- bindings_shadow_count.clear();
- }
- return None
- },
+ let highlight = match name_like {
+ ast::NameLike::NameRef(name_ref) => highlight_name_ref(
+ sema,
+ krate,
+ bindings_shadow_count,
+ &mut binding_hash,
+ syntactic_name_ref_highlighting,
+ name_ref,
+ ),
+ ast::NameLike::Name(name) => {
+ highlight_name(sema, bindings_shadow_count, &mut binding_hash, krate, name)
}
+ ast::NameLike::Lifetime(lifetime) => match IdentClass::classify_lifetime(sema, &lifetime) {
+ Some(IdentClass::NameClass(NameClass::Definition(def))) => {
+ highlight_def(sema, krate, def) | HlMod::Definition
+ }
+ Some(IdentClass::NameRefClass(NameRefClass::Definition(def))) => {
+ highlight_def(sema, krate, def)
+ }
+ // FIXME: Fallback for 'static and '_, as we do not resolve these yet
+ _ => SymbolKind::LifetimeParam.into(),
+ },
};
Some((highlight, binding_hash))
}
}
.into()
}
- (T![+] | T![-] | T![*] | T![/], BIN_EXPR) => HlOperator::Arithmetic.into(),
- (T![+=] | T![-=] | T![*=] | T![/=], BIN_EXPR) => {
+ (T![+] | T![-] | T![*] | T![/] | T![%], BIN_EXPR) => HlOperator::Arithmetic.into(),
+ (T![+=] | T![-=] | T![*=] | T![/=] | T![%=], BIN_EXPR) => {
Highlight::from(HlOperator::Arithmetic) | HlMod::Mutable
}
- (T![|] | T![&] | T![!] | T![^], BIN_EXPR) => HlOperator::Bitwise.into(),
- (T![|=] | T![&=] | T![^=], BIN_EXPR) => {
+ (T![|] | T![&] | T![!] | T![^] | T![>>] | T![<<], BIN_EXPR) => HlOperator::Bitwise.into(),
+ (T![|=] | T![&=] | T![^=] | T![>>=] | T![<<=], BIN_EXPR) => {
Highlight::from(HlOperator::Bitwise) | HlMod::Mutable
}
(T![&&] | T![||], BIN_EXPR) => HlOperator::Logical.into(),
T![true] | T![false] => HlTag::BoolLiteral.into(),
// crate is handled just as a token if it's in an `extern crate`
T![crate] if parent_matches::<ast::ExternCrate>(&token) => h,
- // self, crate and super are handled as either a Name or NameRef already, unless they
+ // self, crate, super and `Self` are handled as either a Name or NameRef already, unless they
// are inside unmapped token trees
- T![self] | T![crate] | T![super] if parent_matches::<ast::NameRef>(&token) => return None,
+ T![self] | T![crate] | T![super] | T![Self] if parent_matches::<ast::NameRef>(&token) => {
+ return None
+ }
T![self] if parent_matches::<ast::Name>(&token) => return None,
T![ref] => match token.parent().and_then(ast::IdentPat::cast) {
Some(ident) if sema.is_unsafe_ident_pat(&ident) => h | HlMod::Unsafe,
None if syntactic_name_ref_highlighting => {
return highlight_name_ref_by_syntax(name_ref, sema, krate)
}
- // FIXME: Workaround for https://github.com/rust-analyzer/rust-analyzer/issues/10708
- //
- // Some popular proc macros (namely async_trait) will rewrite `self` in such a way that it no
- // longer resolves via NameRefClass. If we can't be resolved, but we know we're a self token,
- // within a function with a self param, pretend to still be `self`, rather than
- // an unresolved reference.
- None if name_ref.self_token().is_some() && is_in_fn_with_self_param(&name_ref) => {
- return SymbolKind::SelfParam.into()
- }
// FIXME: This is required for helper attributes used by proc-macros, as those do not map down
// to anything when used.
// We can fix this for derive attributes since derive helpers are recorded, but not for
let mut h = match name_class {
NameRefClass::Definition(def) => {
if let Definition::Local(local) = &def {
- if let Some(name) = local.name(db) {
- let shadow_count = bindings_shadow_count.entry(name.clone()).or_default();
- *binding_hash = Some(calc_binding_hash(&name, *shadow_count))
- }
+ let name = local.name(db);
+ let shadow_count = bindings_shadow_count.entry(name.clone()).or_default();
+ *binding_hash = Some(calc_binding_hash(&name, *shadow_count))
};
let mut h = highlight_def(sema, krate, def);
}
}
}
+ Definition::Macro(_) => {
+ if let Some(macro_call) =
+ ide_db::syntax_helpers::node_ext::full_path_of_name_ref(&name_ref)
+ .and_then(|it| it.syntax().parent().and_then(ast::MacroCall::cast))
+ {
+ if sema.is_unsafe_macro_call(¯o_call) {
+ h |= HlMod::Unsafe;
+ }
+ }
+ }
_ => (),
}
}
NameRefClass::FieldShorthand { .. } => SymbolKind::Field.into(),
};
- if name_ref.self_token().is_some() {
- h.tag = HlTag::Symbol(SymbolKind::SelfParam);
- }
- if name_ref.crate_token().is_some() || name_ref.super_token().is_some() {
- h.tag = HlTag::Keyword;
- }
+
+ h.tag = match name_ref.token_kind() {
+ T![Self] => HlTag::Symbol(SymbolKind::SelfType),
+ T![self] => HlTag::Symbol(SymbolKind::SelfParam),
+ T![super] | T![crate] => HlTag::Keyword,
+ _ => h.tag,
+ };
h
}
) -> Highlight {
let name_kind = NameClass::classify(sema, &name);
if let Some(NameClass::Definition(Definition::Local(local))) = &name_kind {
- if let Some(name) = local.name(sema.db) {
- let shadow_count = bindings_shadow_count.entry(name.clone()).or_default();
- *shadow_count += 1;
- *binding_hash = Some(calc_binding_hash(&name, *shadow_count))
- }
+ let name = local.name(sema.db);
+ let shadow_count = bindings_shadow_count.entry(name.clone()).or_default();
+ *shadow_count += 1;
+ *binding_hash = Some(calc_binding_hash(&name, *shadow_count))
};
match name_kind {
Some(NameClass::Definition(def)) => {
) -> Highlight {
let db = sema.db;
let mut h = match def {
- Definition::Macro(m) => Highlight::new(HlTag::Symbol(m.kind().into())),
+ Definition::Macro(m) => Highlight::new(HlTag::Symbol(m.kind(sema.db).into())),
Definition::Field(_) => Highlight::new(HlTag::Symbol(SymbolKind::Field)),
Definition::Module(module) => {
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Module));
fn parent_matches<N: AstNode>(token: &SyntaxToken) -> bool {
token.parent().map_or(false, |it| N::can_cast(it.kind()))
}
-
-fn is_in_fn_with_self_param(node: &ast::NameRef) -> bool {
- node.syntax()
- .ancestors()
- .find_map(ast::Item::cast)
- .and_then(|item| match item {
- ast::Item::Fn(fn_) => fn_.param_list()?.self_param(),
- _ => None,
- })
- .is_some()
-}
projects / rust.git / blobdiff