diff options
| author | Lukas Wirth <lukastw97@gmail.com> | 2022-08-22 13:55:44 +0200 |
|---|---|---|
| committer | Lukas Wirth <lukastw97@gmail.com> | 2022-08-23 14:05:56 +0200 |
| commit | b26733f8a0b46355e385fceb2baa30aa9b4d420c (patch) | |
| tree | 603a7df413d452defbd98b66b68bd66db4b37518 | |
| parent | 9700c95ced0abb3047ace17afe9aba0086679a76 (diff) | |
| download | rust-b26733f8a0b46355e385fceb2baa30aa9b4d420c.tar.gz rust-b26733f8a0b46355e385fceb2baa30aa9b4d420c.zip | |
Change attribute semantic token type to decorator
| -rw-r--r-- | crates/rust-analyzer/src/semantic_tokens.rs | 4 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crates/rust-analyzer/src/semantic_tokens.rs b/crates/rust-analyzer/src/semantic_tokens.rs index 6c78b5df1a7..ecbbeed93b6 100644 --- a/crates/rust-analyzer/src/semantic_tokens.rs +++ b/crates/rust-analyzer/src/semantic_tokens.rs @@ -40,7 +40,6 @@ macro_rules! define_semantic_token_types { define_semantic_token_types![ (ANGLE, "angle"), (ARITHMETIC, "arithmetic"), - (ATTRIBUTE, "attribute"), (ATTRIBUTE_BRACKET, "attributeBracket"), (BITWISE, "bitwise"), (BOOLEAN, "boolean"), @@ -53,6 +52,8 @@ define_semantic_token_types![ (COMMA, "comma"), (COMPARISON, "comparison"), (CONST_PARAMETER, "constParameter"), + // FIXME: to be replaced once lsp-types has the upstream version + (DECORATOR, "decorator"), (DERIVE, "derive"), (DERIVE_HELPER, "deriveHelper"), (DOT, "dot"), @@ -63,7 +64,6 @@ define_semantic_token_types![ (LIFETIME, "lifetime"), (LOGICAL, "logical"), (MACRO_BANG, "macroBang"), - (OPERATOR, "operator"), (PARENTHESIS, "parenthesis"), (PUNCTUATION, "punctuation"), (SELF_KEYWORD, "selfKeyword"), diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 7a89d6e3e12..6d83adbc5bf 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs @@ -558,7 +558,7 @@ fn semantic_token_type_and_modifiers( let mut mods = semantic_tokens::ModifierSet::default(); let type_ = match highlight.tag { HlTag::Symbol(symbol) => match symbol { - SymbolKind::Attribute => semantic_tokens::ATTRIBUTE, + SymbolKind::Attribute => semantic_tokens::DECORATOR, SymbolKind::Derive => semantic_tokens::DERIVE, SymbolKind::DeriveHelper => semantic_tokens::DERIVE_HELPER, SymbolKind::Module => lsp_types::SemanticTokenType::NAMESPACE, @@ -613,7 +613,7 @@ fn semantic_token_type_and_modifiers( HlOperator::Arithmetic => semantic_tokens::ARITHMETIC, HlOperator::Logical => semantic_tokens::LOGICAL, HlOperator::Comparison => semantic_tokens::COMPARISON, - HlOperator::Other => semantic_tokens::OPERATOR, + HlOperator::Other => lsp_types::SemanticTokenType::OPERATOR, }, HlTag::StringLiteral => lsp_types::SemanticTokenType::STRING, HlTag::UnresolvedReference => semantic_tokens::UNRESOLVED_REFERENCE, |