language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix syntactic highlighting for macros

Browse source
This commit is contained in:
Lukas Wirth 2022-01-02 19:06:19 +01:00
parent 3a525c831f
commit 9eed85b171
2 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/ide/src/syntax_highlighting/highlight.rs
View file

@ -665,21 +665,27 @@ fn highlight_name_ref_by_syntax(
}
}
PATH_SEGMENT => {
let name_based_fallback = || {
if name.text().chars().next().unwrap_or_default().is_uppercase() {
SymbolKind::Struct.into()
} else {
SymbolKind::Module.into()
}
};
let path = match parent.parent().and_then(ast::Path::cast) {
Some(it) => it,
_ => return default.into(),
_ => return name_based_fallback(),
};
let expr = match path.syntax().parent().and_then(ast::PathExpr::cast) {
Some(it) => it,
_ => {
// 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() {
SymbolKind::Struct
} else {
SymbolKind::Module
let expr = match path.syntax().parent() {
Some(parent) => match_ast! {
match parent {
ast::PathExpr(path) => path,
ast::MacroCall(_) => return SymbolKind::Macro.into(),
_ => return name_based_fallback(),
}
.into();
}
},
// within path, decide whether it is module or adt by checking for uppercase name
None => return name_based_fallback(),
};
let parent = match expr.syntax().parent() {
Some(it) => it,