diff options
author | kjeremy <[email protected]> | 2020-09-01 18:10:23 +0100 |
---|---|---|
committer | kjeremy <[email protected]> | 2020-09-02 14:40:59 +0100 |
commit | 36692bdffa59accee75e34647d83cbd8190b7906 (patch) | |
tree | 5f5a681b1770886094f96642f768c54a3614555e | |
parent | b5272573300766d0c8417161c1a4f959abc9ff43 (diff) |
Switch to upstream ENUM_MEMBER
-rw-r--r-- | crates/rust-analyzer/src/semantic_tokens.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/semantic_tokens.rs b/crates/rust-analyzer/src/semantic_tokens.rs index 1225d3e35..a6c4d6099 100644 --- a/crates/rust-analyzer/src/semantic_tokens.rs +++ b/crates/rust-analyzer/src/semantic_tokens.rs | |||
@@ -24,6 +24,7 @@ macro_rules! define_semantic_token_types { | |||
24 | SemanticTokenType::CLASS, | 24 | SemanticTokenType::CLASS, |
25 | SemanticTokenType::INTERFACE, | 25 | SemanticTokenType::INTERFACE, |
26 | SemanticTokenType::ENUM, | 26 | SemanticTokenType::ENUM, |
27 | SemanticTokenType::ENUM_MEMBER, | ||
27 | SemanticTokenType::TYPE_PARAMETER, | 28 | SemanticTokenType::TYPE_PARAMETER, |
28 | SemanticTokenType::FUNCTION, | 29 | SemanticTokenType::FUNCTION, |
29 | SemanticTokenType::MEMBER, | 30 | SemanticTokenType::MEMBER, |
@@ -40,7 +41,6 @@ define_semantic_token_types![ | |||
40 | (ATTRIBUTE, "attribute"), | 41 | (ATTRIBUTE, "attribute"), |
41 | (BOOLEAN, "boolean"), | 42 | (BOOLEAN, "boolean"), |
42 | (BUILTIN_TYPE, "builtinType"), | 43 | (BUILTIN_TYPE, "builtinType"), |
43 | (ENUM_MEMBER, "enumMember"), | ||
44 | (ESCAPE_SEQUENCE, "escapeSequence"), | 44 | (ESCAPE_SEQUENCE, "escapeSequence"), |
45 | (FORMAT_SPECIFIER, "formatSpecifier"), | 45 | (FORMAT_SPECIFIER, "formatSpecifier"), |
46 | (GENERIC, "generic"), | 46 | (GENERIC, "generic"), |
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 16aab52c2..dcbf837d6 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs | |||
@@ -369,7 +369,7 @@ fn semantic_token_type_and_modifiers( | |||
369 | mods |= lsp_types::SemanticTokenModifier::STATIC; | 369 | mods |= lsp_types::SemanticTokenModifier::STATIC; |
370 | lsp_types::SemanticTokenType::VARIABLE | 370 | lsp_types::SemanticTokenType::VARIABLE |
371 | } | 371 | } |
372 | HighlightTag::EnumVariant => semantic_tokens::ENUM_MEMBER, | 372 | HighlightTag::EnumVariant => lsp_types::SemanticTokenType::ENUM_MEMBER, |
373 | HighlightTag::Macro => lsp_types::SemanticTokenType::MACRO, | 373 | HighlightTag::Macro => lsp_types::SemanticTokenType::MACRO, |
374 | HighlightTag::ValueParam => lsp_types::SemanticTokenType::PARAMETER, | 374 | HighlightTag::ValueParam => lsp_types::SemanticTokenType::PARAMETER, |
375 | HighlightTag::Local => lsp_types::SemanticTokenType::VARIABLE, | 375 | HighlightTag::Local => lsp_types::SemanticTokenType::VARIABLE, |