rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use more Rustic highlighting specifiers

Browse Source 
*Method* works for OO languages, but in rust we can also have
associated constants & types, so let's move this to a modifier.
This commit is contained in:
Aleksey Kladov
2020-12-19 17:10:47 +03:00
parent bd270cbc02
commit a13947abe6
8 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/rust-analyzer/src/to_proto.rs
View File

@@ -381,7 +381,13 @@ fn semantic_token_type_and_modifiers(
SymbolKind::ValueParam => lsp_types::SemanticTokenType::PARAMETER,
SymbolKind::SelfParam => semantic_tokens::SELF_KEYWORD,
SymbolKind::Local => lsp_types::SemanticTokenType::VARIABLE,
SymbolKind::Function => lsp_types::SemanticTokenType::FUNCTION,
SymbolKind::Function => {
if highlight.modifiers.contains(HighlightModifier::Associated) {
lsp_types::SemanticTokenType::METHOD
} else {
lsp_types::SemanticTokenType::FUNCTION
}
}
SymbolKind::Const => {
mods |= semantic_tokens::CONSTANT;
mods |= lsp_types::SemanticTokenModifier::STATIC;
@@ -401,7 +407,6 @@ fn semantic_token_type_and_modifiers(
},
HighlightTag::BuiltinType => semantic_tokens::BUILTIN_TYPE,
HighlightTag::Generic => semantic_tokens::GENERIC,
HighlightTag::Method => lsp_types::SemanticTokenType::METHOD,
HighlightTag::ByteLiteral | HighlightTag::NumericLiteral => {
lsp_types::SemanticTokenType::NUMBER
}
@@ -431,6 +436,7 @@ fn semantic_token_type_and_modifiers(
HighlightModifier::Unsafe => semantic_tokens::UNSAFE,
HighlightModifier::Callable => semantic_tokens::CALLABLE,
HighlightModifier::Static => lsp_types::SemanticTokenModifier::STATIC,
HighlightModifier::Associated => continue,
};
mods |= modifier;
}