//! Computes color for a single element.
-use hir::{AsAssocItem, AssocItemContainer, Semantics, VariantDef};
+use hir::{AsAssocItem, HasVisibility, Semantics};
use ide_db::{
defs::{Definition, NameClass, NameRefClass},
RootDatabase, SymbolKind,
pub(super) fn element(
sema: &Semantics<RootDatabase>,
+ krate: Option<hir::Crate>,
bindings_shadow_count: &mut FxHashMap<hir::Name, u32>,
syntactic_name_ref_highlighting: bool,
element: SyntaxElement,
};
match name_kind {
- Some(NameClass::ExternCrate(_)) => HlTag::Symbol(SymbolKind::Module).into(),
- Some(NameClass::Definition(def)) => highlight_def(db, def) | HlMod::Definition,
- Some(NameClass::ConstReference(def)) => highlight_def(db, def),
- Some(NameClass::PatFieldShorthand { field_ref, .. }) => {
- let mut h = HlTag::Symbol(SymbolKind::Field).into();
- if let Definition::Field(field) = field_ref {
- if let VariantDef::Union(_) = field.parent_def(db) {
+ Some(NameClass::Definition(def)) => {
+ let mut h = highlight_def(db, krate, def) | HlMod::Definition;
+ if let Definition::ModuleDef(hir::ModuleDef::Trait(trait_)) = &def {
+ if trait_.is_unsafe(db) {
h |= HlMod::Unsafe;
}
}
-
+ h
+ }
+ Some(NameClass::ConstReference(def)) => highlight_def(db, krate, def),
+ Some(NameClass::PatFieldShorthand { field_ref, .. }) => {
+ let mut h = HlTag::Symbol(SymbolKind::Field).into();
+ if let hir::VariantDef::Union(_) = field_ref.parent_def(db) {
+ h |= HlMod::Unsafe;
+ }
h
}
None => highlight_name_by_syntax(name) | HlMod::Definition,
}
}
-
// Highlight references like the definitions they resolve to
NAME_REF if element.ancestors().any(|it| it.kind() == ATTR) => {
- // even though we track whether we are in an attribute or not we still need this special case
- // as otherwise we would emit unresolved references for name refs inside attributes
- Highlight::from(HlTag::Symbol(SymbolKind::Function))
+ // FIXME: We highlight paths in attributes slightly differently to work around this module
+ // currently not knowing about tool attributes and rustc builtin attributes as
+ // we do not want to resolve those to functions that may be defined in scope.
+ let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap();
+ match NameRefClass::classify(sema, &name_ref) {
+ Some(name_class) => match name_class {
+ NameRefClass::Definition(Definition::ModuleDef(hir::ModuleDef::Module(_)))
+ if name_ref
+ .syntax()
+ .ancestors()
+ .find_map(ast::Path::cast)
+ .map_or(false, |it| it.parent_path().is_some()) =>
+ {
+ HlTag::Symbol(SymbolKind::Module)
+ }
+ NameRefClass::Definition(Definition::Macro(m))
+ if m.kind() == hir::MacroKind::Attr =>
+ {
+ HlTag::Symbol(SymbolKind::Macro)
+ }
+ _ => HlTag::BuiltinAttr,
+ },
+ None => HlTag::BuiltinAttr,
+ }
+ .into()
}
NAME_REF => {
let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap();
- highlight_func_by_name_ref(sema, &name_ref).unwrap_or_else(|| {
- let is_self = name_ref.self_token().is_some();
- let h = match NameRefClass::classify(sema, &name_ref) {
- Some(name_kind) => match name_kind {
- NameRefClass::ExternCrate(_) => HlTag::Symbol(SymbolKind::Module).into(),
- 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))
- }
- };
+ highlight_method_call_by_name_ref(sema, krate, &name_ref).unwrap_or_else(|| {
+ let name_class = match NameRefClass::classify(sema, &name_ref) {
+ Some(name_kind) => name_kind,
+ None => {
+ return if syntactic_name_ref_highlighting {
+ highlight_name_ref_by_syntax(name_ref, sema, krate)
+ } else {
+ HlTag::UnresolvedReference.into()
+ }
+ }
+ };
+ let 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 mut h = highlight_def(db, def);
+ let mut h = highlight_def(db, krate, def);
- if let Definition::Local(local) = &def {
- if is_consumed_lvalue(name_ref.syntax().clone().into(), local, db) {
- h |= HlMod::Consuming;
+ match def {
+ Definition::Local(local)
+ if is_consumed_lvalue(name_ref.syntax(), &local, db) =>
+ {
+ h |= HlMod::Consuming;
+ }
+ Definition::ModuleDef(hir::ModuleDef::Trait(trait_))
+ if trait_.is_unsafe(db) =>
+ {
+ if ast::Impl::for_trait_name_ref(&name_ref).is_some() {
+ h |= HlMod::Unsafe;
}
}
-
- if let Some(parent) = name_ref.syntax().parent() {
- if matches!(parent.kind(), FIELD_EXPR | RECORD_PAT_FIELD) {
- if let Definition::Field(field) = def {
- if let VariantDef::Union(_) = field.parent_def(db) {
+ Definition::Field(field) => {
+ if let Some(parent) = name_ref.syntax().parent() {
+ if matches!(parent.kind(), FIELD_EXPR | RECORD_PAT_FIELD) {
+ if let hir::VariantDef::Union(_) = field.parent_def(db) {
h |= HlMod::Unsafe;
}
}
}
}
-
- h
+ _ => (),
}
- NameRefClass::FieldShorthand { .. } => {
- HlTag::Symbol(SymbolKind::Field).into()
- }
- },
- None if syntactic_name_ref_highlighting => {
- highlight_name_ref_by_syntax(name_ref, sema)
+
+ h
}
- None => HlTag::UnresolvedReference.into(),
+ NameRefClass::FieldShorthand { .. } => SymbolKind::Field.into(),
};
- if h.tag == HlTag::Symbol(SymbolKind::Module) && is_self {
- HlTag::Symbol(SymbolKind::SelfParam).into()
+ if h.tag == HlTag::Symbol(SymbolKind::Module) && name_ref.self_token().is_some() {
+ SymbolKind::SelfParam.into()
} else {
h
}
}
STRING | BYTE_STRING => HlTag::StringLiteral.into(),
ATTR => HlTag::Attribute.into(),
+ INT_NUMBER if element.ancestors().nth(1).map_or(false, |it| it.kind() == FIELD_EXPR) => {
+ SymbolKind::Field.into()
+ }
INT_NUMBER | FLOAT_NUMBER => HlTag::NumericLiteral.into(),
BYTE => HlTag::ByteLiteral.into(),
CHAR => HlTag::CharLiteral.into(),
- QUESTION => Highlight::new(HlTag::Operator(HlOperator::Other)) | HlMod::ControlFlow,
+ QUESTION => HlTag::Operator(HlOperator::Other) | HlMod::ControlFlow,
LIFETIME => {
let lifetime = element.into_node().and_then(ast::Lifetime::cast).unwrap();
match NameClass::classify_lifetime(sema, &lifetime) {
- Some(NameClass::Definition(def)) => highlight_def(db, def) | HlMod::Definition,
+ Some(NameClass::Definition(def)) => {
+ highlight_def(db, krate, def) | HlMod::Definition
+ }
None => match NameRefClass::classify_lifetime(sema, &lifetime) {
- Some(NameRefClass::Definition(def)) => highlight_def(db, def),
- _ => Highlight::new(HlTag::Symbol(SymbolKind::LifetimeParam)),
+ Some(NameRefClass::Definition(def)) => highlight_def(db, krate, def),
+ _ => SymbolKind::LifetimeParam.into(),
},
- _ => Highlight::new(HlTag::Symbol(SymbolKind::LifetimeParam)) | HlMod::Definition,
+ _ => Highlight::from(SymbolKind::LifetimeParam) | HlMod::Definition,
}
}
+ IDENT if parent_matches::<ast::TokenTree>(&element) => HlTag::None.into(),
p if p.is_punct() => match p {
- T![&] if element.parent().and_then(ast::BinExpr::cast).is_some() => {
- HlTag::Operator(HlOperator::Bitwise).into()
- }
+ T![&] if parent_matches::<ast::BinExpr>(&element) => HlOperator::Bitwise.into(),
T![&] => {
let h = HlTag::Operator(HlOperator::Other).into();
let is_unsafe = element
.parent()
.and_then(ast::RefExpr::cast)
- .map(|ref_expr| sema.is_unsafe_ref_expr(&ref_expr))
- .unwrap_or(false);
+ .map_or(false, |ref_expr| sema.is_unsafe_ref_expr(&ref_expr));
if is_unsafe {
h | HlMod::Unsafe
} else {
h
}
}
- T![::] | T![->] | T![=>] | T![..] | T![=] | T![@] | T![.] => {
- HlTag::Operator(HlOperator::Other).into()
- }
- T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => {
- eprintln!("in macro call: {}", element);
- HlTag::Symbol(SymbolKind::Macro).into()
- }
- T![!] if element.parent().and_then(ast::NeverType::cast).is_some() => {
- eprintln!("in never type : {}", element);
- HlTag::BuiltinType.into()
- }
- T![!] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
- eprintln!("pre expr for : {}", element);
- HlTag::Operator(HlOperator::Bitwise).into()
- }
- T![*] if element.parent().and_then(ast::PtrType::cast).is_some() => {
- HlTag::Keyword.into()
- }
- T![*] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
+ T![::] | T![->] | T![=>] | T![..] | T![=] | T![@] | T![.] => HlOperator::Other.into(),
+ T![!] if parent_matches::<ast::MacroCall>(&element) => SymbolKind::Macro.into(),
+ T![!] if parent_matches::<ast::NeverType>(&element) => HlTag::BuiltinType.into(),
+ T![!] if parent_matches::<ast::PrefixExpr>(&element) => HlOperator::Logical.into(),
+ T![*] if parent_matches::<ast::PtrType>(&element) => HlTag::Keyword.into(),
+ T![*] if parent_matches::<ast::PrefixExpr>(&element) => {
let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
let expr = prefix_expr.expr()?;
if ty.is_raw_ptr() {
HlTag::Operator(HlOperator::Other) | HlMod::Unsafe
} else if let Some(ast::PrefixOp::Deref) = prefix_expr.op_kind() {
- HlTag::Operator(HlOperator::Other).into()
+ HlOperator::Other.into()
} else {
- HlTag::Punctuation(HlPunct::Other).into()
+ HlPunct::Other.into()
}
}
- T![-] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
- eprintln!("the - operator: {}", element);
+ T![-] if parent_matches::<ast::PrefixExpr>(&element) => {
let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
let expr = prefix_expr.expr()?;
}
.into()
}
- _ if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
- eprintln!("the prefix expr block: {}", element);
- HlTag::Operator(HlOperator::Other).into()
- }
+ _ if parent_matches::<ast::PrefixExpr>(&element) => HlOperator::Other.into(),
T![+] | T![-] | T![*] | T![/] | T![+=] | T![-=] | T![*=] | T![/=]
- if element.parent().and_then(ast::BinExpr::cast).is_some() =>
+ if parent_matches::<ast::BinExpr>(&element) =>
{
- HlTag::Operator(HlOperator::Arithmetic).into()
+ HlOperator::Arithmetic.into()
}
T![|] | T![&] | T![!] | T![^] | T![|=] | T![&=] | T![^=]
- if element.parent().and_then(ast::BinExpr::cast).is_some() =>
+ if parent_matches::<ast::BinExpr>(&element) =>
{
- HlTag::Operator(HlOperator::Bitwise).into()
+ HlOperator::Bitwise.into()
}
- T![&&] | T![||] if element.parent().and_then(ast::BinExpr::cast).is_some() => {
- HlTag::Operator(HlOperator::Logical).into()
+ T![&&] | T![||] if parent_matches::<ast::BinExpr>(&element) => {
+ HlOperator::Logical.into()
}
T![>] | T![<] | T![==] | T![>=] | T![<=] | T![!=]
- if element.parent().and_then(ast::BinExpr::cast).is_some() =>
+ if parent_matches::<ast::BinExpr>(&element) =>
{
- HlTag::Operator(HlOperator::Comparision).into()
- }
- _ if element.parent().and_then(ast::BinExpr::cast).is_some() => {
- eprintln!("the bin expr : {}", element);
- HlTag::Operator(HlOperator::Other).into()
- }
- _ if element.parent().and_then(ast::RangeExpr::cast).is_some() => {
- eprintln!("the range expr block: {}", element);
- HlTag::Operator(HlOperator::Other).into()
+ HlOperator::Comparison.into()
}
- _ if element.parent().and_then(ast::RangePat::cast).is_some() => {
- HlTag::Operator(HlOperator::Other).into()
- }
- _ if element.parent().and_then(ast::RestPat::cast).is_some() => {
- HlTag::Operator(HlOperator::Other).into()
- }
- _ if element.parent().and_then(ast::Attr::cast).is_some() => HlTag::Attribute.into(),
- kind => HlTag::Punctuation(match kind {
+ _ if parent_matches::<ast::BinExpr>(&element) => HlOperator::Other.into(),
+ _ if parent_matches::<ast::RangeExpr>(&element) => HlOperator::Other.into(),
+ _ if parent_matches::<ast::RangePat>(&element) => HlOperator::Other.into(),
+ _ if parent_matches::<ast::RestPat>(&element) => HlOperator::Other.into(),
+ _ if parent_matches::<ast::Attr>(&element) => HlTag::Attribute.into(),
+ kind => match kind {
T!['['] | T![']'] => HlPunct::Bracket,
T!['{'] | T!['}'] => HlPunct::Brace,
T!['('] | T![')'] => HlPunct::Parenthesis,
T![;] => HlPunct::Semi,
T![.] => HlPunct::Dot,
_ => HlPunct::Other,
- })
+ }
.into(),
},
k if k.is_keyword() => {
let h = Highlight::new(HlTag::Keyword);
match k {
+ T![await] => h | HlMod::Async | HlMod::ControlFlow,
T![break]
| T![continue]
| T![else]
| T![if]
+ | T![in]
| T![loop]
| T![match]
| T![return]
| T![while]
- | T![in] => h | HlMod::ControlFlow,
+ | T![yield] => h | HlMod::ControlFlow,
T![for] if !is_child_of_impl(&element) => h | HlMod::ControlFlow,
T![unsafe] => h | HlMod::Unsafe,
T![true] | T![false] => HlTag::BoolLiteral.into(),
})
.map(|modifier| h | modifier)
.unwrap_or(h),
+ T![async] => h | HlMod::Async,
_ => h,
}
}
hash((name, shadow_count))
}
}
-
-fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
- match def {
- Definition::Macro(_) => HlTag::Symbol(SymbolKind::Macro),
- Definition::Field(_) => HlTag::Symbol(SymbolKind::Field),
+fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition) -> Highlight {
+ let mut h = match def {
+ Definition::Macro(_) => Highlight::new(HlTag::Symbol(SymbolKind::Macro)),
+ Definition::Field(_) => Highlight::new(HlTag::Symbol(SymbolKind::Field)),
Definition::ModuleDef(def) => match def {
- hir::ModuleDef::Module(_) => HlTag::Symbol(SymbolKind::Module),
+ hir::ModuleDef::Module(_) => Highlight::new(HlTag::Symbol(SymbolKind::Module)),
hir::ModuleDef::Function(func) => {
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Function));
if let Some(item) = func.as_assoc_item(db) {
h |= HlMod::Associated;
- if func.self_param(db).is_none() {
- h |= HlMod::Static
+ match func.self_param(db) {
+ Some(sp) => {
+ if let hir::Access::Exclusive = sp.access(db) {
+ h |= HlMod::Mutable;
+ }
+ }
+ None => h |= HlMod::Static,
}
match item.container(db) {
- AssocItemContainer::Impl(i) => {
+ hir::AssocItemContainer::Impl(i) => {
if i.trait_(db).is_some() {
h |= HlMod::Trait;
}
}
- AssocItemContainer::Trait(_t) => {
+ hir::AssocItemContainer::Trait(_t) => {
h |= HlMod::Trait;
}
}
if func.is_unsafe(db) {
h |= HlMod::Unsafe;
}
- return h;
+ if func.is_async(db) {
+ h |= HlMod::Async;
+ }
+
+ h
}
- hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HlTag::Symbol(SymbolKind::Struct),
- hir::ModuleDef::Adt(hir::Adt::Enum(_)) => HlTag::Symbol(SymbolKind::Enum),
- hir::ModuleDef::Adt(hir::Adt::Union(_)) => HlTag::Symbol(SymbolKind::Union),
- hir::ModuleDef::Variant(_) => HlTag::Symbol(SymbolKind::Variant),
+ hir::ModuleDef::Adt(adt) => {
+ let h = match adt {
+ hir::Adt::Struct(_) => HlTag::Symbol(SymbolKind::Struct),
+ hir::Adt::Enum(_) => HlTag::Symbol(SymbolKind::Enum),
+ hir::Adt::Union(_) => HlTag::Symbol(SymbolKind::Union),
+ };
+
+ Highlight::new(h)
+ }
+ hir::ModuleDef::Variant(_) => Highlight::new(HlTag::Symbol(SymbolKind::Variant)),
hir::ModuleDef::Const(konst) => {
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Const));
+
if let Some(item) = konst.as_assoc_item(db) {
h |= HlMod::Associated;
match item.container(db) {
- AssocItemContainer::Impl(i) => {
+ hir::AssocItemContainer::Impl(i) => {
if i.trait_(db).is_some() {
h |= HlMod::Trait;
}
}
- AssocItemContainer::Trait(_t) => {
+ hir::AssocItemContainer::Trait(_t) => {
h |= HlMod::Trait;
}
}
}
- return h;
+ h
}
- hir::ModuleDef::Trait(_) => HlTag::Symbol(SymbolKind::Trait),
+ hir::ModuleDef::Trait(_) => Highlight::new(HlTag::Symbol(SymbolKind::Trait)),
hir::ModuleDef::TypeAlias(type_) => {
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::TypeAlias));
- if type_.as_assoc_item(db).is_some() {
- h |= HlMod::Associated
+
+ if let Some(item) = type_.as_assoc_item(db) {
+ h |= HlMod::Associated;
+ match item.container(db) {
+ hir::AssocItemContainer::Impl(i) => {
+ if i.trait_(db).is_some() {
+ h |= HlMod::Trait;
+ }
+ }
+ hir::AssocItemContainer::Trait(_t) => {
+ h |= HlMod::Trait;
+ }
+ }
}
- return h;
+
+ h
}
- hir::ModuleDef::BuiltinType(_) => HlTag::BuiltinType,
+ hir::ModuleDef::BuiltinType(_) => Highlight::new(HlTag::BuiltinType),
hir::ModuleDef::Static(s) => {
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Static));
+
if s.is_mut(db) {
h |= HlMod::Mutable;
h |= HlMod::Unsafe;
}
- return h;
+
+ h
}
},
- Definition::SelfType(_) => HlTag::Symbol(SymbolKind::Impl),
+ Definition::SelfType(_) => Highlight::new(HlTag::Symbol(SymbolKind::Impl)),
Definition::GenericParam(it) => match it {
- hir::GenericParam::TypeParam(_) => HlTag::Symbol(SymbolKind::TypeParam),
- hir::GenericParam::ConstParam(_) => HlTag::Symbol(SymbolKind::ConstParam),
- hir::GenericParam::LifetimeParam(_) => HlTag::Symbol(SymbolKind::LifetimeParam),
+ hir::GenericParam::TypeParam(_) => Highlight::new(HlTag::Symbol(SymbolKind::TypeParam)),
+ hir::GenericParam::ConstParam(_) => {
+ Highlight::new(HlTag::Symbol(SymbolKind::ConstParam))
+ }
+ hir::GenericParam::LifetimeParam(_) => {
+ Highlight::new(HlTag::Symbol(SymbolKind::LifetimeParam))
+ }
},
Definition::Local(local) => {
let tag = if local.is_self(db) {
if ty.as_callable(db).is_some() || ty.impls_fnonce(db) {
h |= HlMod::Callable;
}
- return h;
+ h
}
- Definition::Label(_) => HlTag::Symbol(SymbolKind::Label),
+ Definition::Label(_) => Highlight::new(HlTag::Symbol(SymbolKind::Label)),
+ };
+
+ let is_from_other_crate = def.module(db).map(hir::Module::krate) != krate;
+ let is_builtin_type = matches!(def, Definition::ModuleDef(hir::ModuleDef::BuiltinType(_)));
+ let is_public = def.visibility(db) == Some(hir::Visibility::Public);
+
+ match (is_from_other_crate, is_builtin_type, is_public) {
+ (true, false, _) => h |= HlMod::Library,
+ (false, _, true) => h |= HlMod::Public,
+ _ => {}
}
- .into()
+
+ h
}
-fn highlight_func_by_name_ref(
+fn highlight_method_call_by_name_ref(
sema: &Semantics<RootDatabase>,
+ krate: Option<hir::Crate>,
name_ref: &ast::NameRef,
) -> Option<Highlight> {
let mc = name_ref.syntax().parent().and_then(ast::MethodCallExpr::cast)?;
- highlight_method_call(sema, &mc)
+ highlight_method_call(sema, krate, &mc)
}
fn highlight_method_call(
sema: &Semantics<RootDatabase>,
+ krate: Option<hir::Crate>,
method_call: &ast::MethodCallExpr,
) -> Option<Highlight> {
- let func = sema.resolve_method_call(&method_call)?;
- let mut h = HlTag::Symbol(SymbolKind::Function).into();
+ let func = sema.resolve_method_call(method_call)?;
+
+ let mut h = SymbolKind::Function.into();
h |= HlMod::Associated;
- if func.is_unsafe(sema.db) || sema.is_unsafe_method_call(&method_call) {
+
+ if func.is_unsafe(sema.db) || sema.is_unsafe_method_call(method_call) {
h |= HlMod::Unsafe;
}
+ if func.is_async(sema.db) {
+ h |= HlMod::Async;
+ }
if func.as_assoc_item(sema.db).and_then(|it| it.containing_trait(sema.db)).is_some() {
- h |= HlMod::Trait
+ h |= HlMod::Trait;
+ }
+
+ let is_from_other_crate = Some(func.module(sema.db).krate()) != krate;
+ let is_public = func.visibility(sema.db) == hir::Visibility::Public;
+
+ if is_from_other_crate {
+ h |= HlMod::Library;
+ } else if is_public {
+ h |= HlMod::Public;
}
if let Some(self_param) = func.self_param(sema.db) {
};
let tag = match parent.kind() {
- STRUCT => HlTag::Symbol(SymbolKind::Struct),
- ENUM => HlTag::Symbol(SymbolKind::Enum),
- VARIANT => HlTag::Symbol(SymbolKind::Variant),
- UNION => HlTag::Symbol(SymbolKind::Union),
- TRAIT => HlTag::Symbol(SymbolKind::Trait),
- TYPE_ALIAS => HlTag::Symbol(SymbolKind::TypeAlias),
- TYPE_PARAM => HlTag::Symbol(SymbolKind::TypeParam),
- RECORD_FIELD => HlTag::Symbol(SymbolKind::Field),
- MODULE => HlTag::Symbol(SymbolKind::Module),
- FN => HlTag::Symbol(SymbolKind::Function),
- CONST => HlTag::Symbol(SymbolKind::Const),
- STATIC => HlTag::Symbol(SymbolKind::Static),
- IDENT_PAT => HlTag::Symbol(SymbolKind::Local),
- _ => default,
+ STRUCT => SymbolKind::Struct,
+ ENUM => SymbolKind::Enum,
+ VARIANT => SymbolKind::Variant,
+ UNION => SymbolKind::Union,
+ TRAIT => SymbolKind::Trait,
+ TYPE_ALIAS => SymbolKind::TypeAlias,
+ TYPE_PARAM => SymbolKind::TypeParam,
+ RECORD_FIELD => SymbolKind::Field,
+ MODULE => SymbolKind::Module,
+ FN => SymbolKind::Function,
+ CONST => SymbolKind::Const,
+ STATIC => SymbolKind::Static,
+ IDENT_PAT => SymbolKind::Local,
+ _ => return default.into(),
};
tag.into()
}
-fn highlight_name_ref_by_syntax(name: ast::NameRef, sema: &Semantics<RootDatabase>) -> Highlight {
+fn highlight_name_ref_by_syntax(
+ name: ast::NameRef,
+ sema: &Semantics<RootDatabase>,
+ krate: Option<hir::Crate>,
+) -> Highlight {
let default = HlTag::UnresolvedReference;
let parent = match name.syntax().parent() {
};
match parent.kind() {
- METHOD_CALL_EXPR => {
- return ast::MethodCallExpr::cast(parent)
- .and_then(|it| highlight_method_call(sema, &it))
- .unwrap_or_else(|| HlTag::Symbol(SymbolKind::Function).into());
- }
+ METHOD_CALL_EXPR => ast::MethodCallExpr::cast(parent)
+ .and_then(|it| highlight_method_call(sema, krate, &it))
+ .unwrap_or_else(|| SymbolKind::Function.into()),
FIELD_EXPR => {
let h = HlTag::Symbol(SymbolKind::Field);
let is_union = ast::FieldExpr::cast(parent)
- .and_then(|field_expr| {
- let field = sema.resolve_field(&field_expr)?;
- Some(if let VariantDef::Union(_) = field.parent_def(sema.db) {
- true
- } else {
- false
- })
- })
- .unwrap_or(false);
+ .and_then(|field_expr| sema.resolve_field(&field_expr))
+ .map_or(false, |field| {
+ matches!(field.parent_def(sema.db), hir::VariantDef::Union(_))
+ });
if is_union {
h | HlMod::Unsafe
} else {
_ => {
// within path, decide whether it is module or adt by checking for uppercase name
return if name.text().chars().next().unwrap_or_default().is_uppercase() {
- HlTag::Symbol(SymbolKind::Struct)
+ SymbolKind::Struct
} else {
- HlTag::Symbol(SymbolKind::Module)
+ SymbolKind::Module
}
.into();
}
};
match parent.kind() {
- CALL_EXPR => HlTag::Symbol(SymbolKind::Function).into(),
+ CALL_EXPR => SymbolKind::Function.into(),
_ => if name.text().chars().next().unwrap_or_default().is_uppercase() {
- HlTag::Symbol(SymbolKind::Struct)
+ SymbolKind::Struct
} else {
- HlTag::Symbol(SymbolKind::Const)
+ SymbolKind::Const
}
.into(),
}
}
}
-fn is_consumed_lvalue(
- node: NodeOrToken<SyntaxNode, SyntaxToken>,
- local: &hir::Local,
- db: &RootDatabase,
-) -> bool {
+fn is_consumed_lvalue(node: &SyntaxNode, local: &hir::Local, db: &RootDatabase) -> bool {
// When lvalues are passed as arguments and they're not Copy, then mark them as Consuming.
- parents_match(node, &[PATH_SEGMENT, PATH, PATH_EXPR, ARG_LIST]) && !local.ty(db).is_copy(db)
+ parents_match(node.clone().into(), &[PATH_SEGMENT, PATH, PATH_EXPR, ARG_LIST])
+ && !local.ty(db).is_copy(db)
}
/// Returns true if the parent nodes of `node` all match the `SyntaxKind`s in `kinds` exactly.
kinds.len() == 0
}
+#[inline]
+fn parent_matches<N: AstNode>(element: &SyntaxElement) -> bool {
+ element.parent().map_or(false, |it| N::can_cast(it.kind()))
+}
+
fn is_child_of_impl(element: &SyntaxElement) -> bool {
match element.parent() {
Some(e) => e.kind() == IMPL,
projects / rust.git / blobdiff