};
use rustc_hash::FxHashMap;
-use crate::{call_info::call_info_for_token, Analysis, FileId};
+use crate::{call_info::ActiveParameter, Analysis, FileId};
use ast::FormatSpecifier;
pub(crate) use html::highlight_as_html;
let prev = self.stack.last_mut().unwrap();
let needs_flattening = !children.is_empty()
&& !prev.is_empty()
- && children.first().unwrap().range.is_subrange(&prev.last().unwrap().range);
+ && prev.last().unwrap().range.contains_range(children.first().unwrap().range);
if !needs_flattening {
prev.extend(children);
} else {
let mut parent = prev.pop().unwrap();
for ele in children {
- assert!(ele.range.is_subrange(&parent.range));
+ assert!(parent.range.contains_range(ele.range));
let mut cloned = parent.clone();
- parent.range = TextRange::from_to(parent.range.start(), ele.range.start());
- cloned.range = TextRange::from_to(ele.range.end(), cloned.range.end());
+ parent.range = TextRange::new(parent.range.start(), ele.range.start());
+ cloned.range = TextRange::new(ele.range.end(), cloned.range.end());
if !parent.range.is_empty() {
prev.push(parent);
}
};
// Element outside of the viewport, no need to highlight
- if range_to_highlight.intersection(&event_range).is_none() {
+ if range_to_highlight.intersect(event_range).is_none() {
continue;
}
binding_hash: None,
});
}
+ if let Some(name) = mc.is_macro_rules() {
+ if let Some((highlight, binding_hash)) = highlight_element(
+ &sema,
+ &mut bindings_shadow_count,
+ name.syntax().clone().into(),
+ ) {
+ stack.add(HighlightedRange {
+ range: name.syntax().text_range(),
+ highlight,
+ binding_hash,
+ });
+ }
+ }
continue;
}
WalkEvent::Leave(Some(mc)) => {
let token = sema.descend_into_macros(token.clone());
let parent = token.parent();
- // Check if macro takes a format string and remeber it for highlighting later.
+ // Check if macro takes a format string and remember it for highlighting later.
// The macros that accept a format string expand to a compiler builtin macros
// `format_args` and `format_args_nl`.
if let Some(fmt_macro_call) = parent.parent().and_then(ast::MacroCall::cast) {
}
}
- let is_format_string =
- format_string.as_ref().map(|fs| fs == &element_to_highlight).unwrap_or_default();
+ let is_format_string = format_string.as_ref() == Some(&element_to_highlight);
if let Some((highlight, binding_hash)) =
highlight_element(&sema, &mut bindings_shadow_count, element_to_highlight.clone())
{
stack.push();
if is_format_string {
- string.lex_format_specifier(&mut |piece_range, kind| {
- let highlight = match kind {
- FormatSpecifier::Open
- | FormatSpecifier::Close
- | FormatSpecifier::Colon
- | FormatSpecifier::Fill
- | FormatSpecifier::Align
- | FormatSpecifier::Sign
- | FormatSpecifier::NumberSign
- | FormatSpecifier::DollarSign
- | FormatSpecifier::Dot
- | FormatSpecifier::Asterisk
- | FormatSpecifier::QuestionMark => HighlightTag::Attribute,
- FormatSpecifier::Integer | FormatSpecifier::Zero => {
- HighlightTag::NumericLiteral
- }
- FormatSpecifier::Identifier => HighlightTag::Local,
- };
- stack.add(HighlightedRange {
- range: piece_range + range.start(),
- highlight: highlight.into(),
- binding_hash: None,
- });
+ string.lex_format_specifier(|piece_range, kind| {
+ if let Some(highlight) = highlight_format_specifier(kind) {
+ stack.add(HighlightedRange {
+ range: piece_range + range.start(),
+ highlight: highlight.into(),
+ binding_hash: None,
+ });
+ }
+ });
+ }
+ stack.pop();
+ } else if let Some(string) =
+ element_to_highlight.as_token().cloned().and_then(ast::RawString::cast)
+ {
+ stack.push();
+ if is_format_string {
+ string.lex_format_specifier(|piece_range, kind| {
+ if let Some(highlight) = highlight_format_specifier(kind) {
+ stack.add(HighlightedRange {
+ range: piece_range + range.start(),
+ highlight: highlight.into(),
+ binding_hash: None,
+ });
+ }
});
}
stack.pop();
stack.flattened()
}
+fn highlight_format_specifier(kind: FormatSpecifier) -> Option<HighlightTag> {
+ Some(match kind {
+ FormatSpecifier::Open
+ | FormatSpecifier::Close
+ | FormatSpecifier::Colon
+ | FormatSpecifier::Fill
+ | FormatSpecifier::Align
+ | FormatSpecifier::Sign
+ | FormatSpecifier::NumberSign
+ | FormatSpecifier::DollarSign
+ | FormatSpecifier::Dot
+ | FormatSpecifier::Asterisk
+ | FormatSpecifier::QuestionMark => HighlightTag::FormatSpecifier,
+ FormatSpecifier::Integer | FormatSpecifier::Zero => HighlightTag::NumericLiteral,
+ FormatSpecifier::Identifier => HighlightTag::Local,
+ })
+}
+
fn macro_call_range(macro_call: &ast::MacroCall) -> Option<TextRange> {
let path = macro_call.path()?;
let name_ref = path.segment()?.name_ref()?;
}
}
- Some(TextRange::from_to(range_start, range_end))
+ Some(TextRange::new(range_start, range_end))
}
fn highlight_element(
}
// Highlight references like the definitions they resolve to
- NAME_REF if element.ancestors().any(|it| it.kind() == ATTR) => return None,
+ NAME_REF if element.ancestors().any(|it| it.kind() == ATTR) => {
+ Highlight::from(HighlightTag::Function) | HighlightModifier::Attribute
+ }
NAME_REF => {
let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap();
- let name_kind = classify_name_ref(sema, &name_ref)?;
-
- match name_kind {
- 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_name(db, def)
- }
- NameRefClass::FieldShorthand { .. } => HighlightTag::Field.into(),
+ match classify_name_ref(sema, &name_ref) {
+ Some(name_kind) => match name_kind {
+ 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_name(db, def)
+ }
+ NameRefClass::FieldShorthand { .. } => HighlightTag::Field.into(),
+ },
+ None => HighlightTag::UnresolvedReference.into(),
}
}
T![break]
| T![continue]
| T![else]
- | T![for]
| T![if]
| T![loop]
| T![match]
| T![return]
- | T![while] => h | HighlightModifier::ControlFlow,
+ | T![while]
+ | T![in] => h | HighlightModifier::ControlFlow,
+ T![for] if !is_child_of_impl(element) => h | HighlightModifier::ControlFlow,
T![unsafe] => h | HighlightModifier::Unsafe,
+ T![true] | T![false] => HighlightTag::BoolLiteral.into(),
+ T![self] => HighlightTag::SelfKeyword.into(),
_ => h,
}
}
}
}
+fn is_child_of_impl(element: SyntaxElement) -> bool {
+ match element.parent() {
+ Some(e) => e.kind() == IMPL_DEF,
+ _ => false,
+ }
+}
+
fn highlight_name(db: &RootDatabase, def: Definition) -> Highlight {
match def {
Definition::Macro(_) => HighlightTag::Macro,
- Definition::StructField(_) => HighlightTag::Field,
+ Definition::Field(_) => HighlightTag::Field,
Definition::ModuleDef(def) => match def {
hir::ModuleDef::Module(_) => HighlightTag::Module,
hir::ModuleDef::Function(_) => HighlightTag::Function,
hir::ModuleDef::Adt(hir::Adt::Union(_)) => HighlightTag::Union,
hir::ModuleDef::EnumVariant(_) => HighlightTag::EnumVariant,
hir::ModuleDef::Const(_) => HighlightTag::Constant,
- hir::ModuleDef::Static(_) => HighlightTag::Static,
hir::ModuleDef::Trait(_) => HighlightTag::Trait,
hir::ModuleDef::TypeAlias(_) => HighlightTag::TypeAlias,
hir::ModuleDef::BuiltinType(_) => HighlightTag::BuiltinType,
+ hir::ModuleDef::Static(s) => {
+ let mut h = Highlight::new(HighlightTag::Static);
+ if s.is_mut(db) {
+ h |= HighlightModifier::Mutable;
+ }
+ return h;
+ }
},
Definition::SelfType(_) => HighlightTag::SelfType,
Definition::TypeParam(_) => HighlightTag::TypeParam,
}
fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
- let default = HighlightTag::Function.into();
+ let default = HighlightTag::UnresolvedReference;
let parent = match name.syntax().parent() {
Some(it) => it,
- _ => return default,
+ _ => return default.into(),
};
- match parent.kind() {
- STRUCT_DEF => HighlightTag::Struct.into(),
- ENUM_DEF => HighlightTag::Enum.into(),
- UNION_DEF => HighlightTag::Union.into(),
- TRAIT_DEF => HighlightTag::Trait.into(),
- TYPE_ALIAS_DEF => HighlightTag::TypeAlias.into(),
- TYPE_PARAM => HighlightTag::TypeParam.into(),
- RECORD_FIELD_DEF => HighlightTag::Field.into(),
+ let tag = match parent.kind() {
+ STRUCT_DEF => HighlightTag::Struct,
+ ENUM_DEF => HighlightTag::Enum,
+ UNION_DEF => HighlightTag::Union,
+ TRAIT_DEF => HighlightTag::Trait,
+ TYPE_ALIAS_DEF => HighlightTag::TypeAlias,
+ TYPE_PARAM => HighlightTag::TypeParam,
+ RECORD_FIELD_DEF => HighlightTag::Field,
+ MODULE => HighlightTag::Module,
+ FN_DEF => HighlightTag::Function,
+ CONST_DEF => HighlightTag::Constant,
+ STATIC_DEF => HighlightTag::Static,
+ ENUM_VARIANT => HighlightTag::EnumVariant,
+ BIND_PAT => HighlightTag::Local,
_ => default,
- }
+ };
+
+ tag.into()
}
fn highlight_injection(
literal: ast::RawString,
expanded: SyntaxToken,
) -> Option<()> {
- let call_info = call_info_for_token(&sema, expanded)?;
- let idx = call_info.active_parameter?;
- let name = call_info.signature.parameter_names.get(idx)?;
- if !name.starts_with("ra_fixture") {
+ let active_parameter = ActiveParameter::at_token(&sema, expanded)?;
+ if !active_parameter.name.starts_with("ra_fixture") {
return None;
}
let value = literal.value()?;
projects / rust.git / blobdiff