Adjust package.json semantic highlighting items

Author: Veykril

crates/ide/src/syntax_highlighting/tags.rs

@@ -226,8 +226,8 @@ impl HlMod {
 HlMod::IntraDocLink,
 HlMod::Library,
 HlMod::Macro,
-HlMod::ProcMacro,
 HlMod::Mutable,
+HlMod::ProcMacro,
 HlMod::Public,
 HlMod::Reference,
 HlMod::Static,

crates/rust-analyzer/src/lsp/semantic_tokens.rs

@@ -72,7 +72,7 @@ define_semantic_token_types![
 (BRACE,"brace"),
 (BRACKET,"bracket"),
 (BUILTIN_ATTRIBUTE,"builtinAttribute") => DECORATOR,
-(BUILTIN_TYPE,"builtinType"),
+(BUILTIN_TYPE,"builtinType") => TYPE,
 (CHAR,"character") => STRING,
 (COLON,"colon"),
 (COMMA,"comma"),
@@ -99,7 +99,7 @@ define_semantic_token_types![
 (STATIC,"static") => VARIABLE,
 (TOOL_MODULE,"toolModule") => DECORATOR,
 (TYPE_ALIAS,"typeAlias") => TYPE,
-(UNION,"union") => STRUCT,
+(UNION,"union") => TYPE,
 (UNRESOLVED_REFERENCE,"unresolvedReference"),
 }
 ];
@@ -155,7 +155,7 @@ define_semantic_token_modifiers![
 (LIBRARY,"library"),
 (MACRO_MODIFIER,"macro"),
 (MUTABLE,"mutable"),
-(PROC_MACRO_MODIFIER,"proc_macro"),
+(PROC_MACRO_MODIFIER,"procMacro"),
 (PUBLIC,"public"),
 (REFERENCE,"reference"),
 (TRAIT_MODIFIER,"trait"),

editors/code/package.json

@@ -1934,6 +1934,11 @@
 "id": "constParameter",
 "description": "Style for const generics"
  },
+ {
+"id": "const",
+"description": "Style for consts",
+"superType": "variable"
+ },
  {
 "id": "derive",
 "description": "Style for derives",
@@ -1979,20 +1984,25 @@
 "description": "Style for the ! token of macro calls",
 "superType": "punctuation"
  },
- {
-"id": "operator",
-"description": "Style for operators",
-"superType": "punctuation"
- },
  {
 "id": "parenthesis",
 "description": "Style for ( or )",
 "superType": "punctuation"
  },
+ {
+"id": "procMacro",
+"description": "Style for proc macro code",
+"superType": "macro"
+ },
  {
 "id": "punctuation",
 "description": "Style for generic punctuation"
  },
+ {
+"id": "operator",
+"description": "Style for operators",
+"superType": "punctuation"
+ },
  {
 "id": "selfKeyword",
 "description": "Style for the self keyword",
@@ -2008,6 +2018,16 @@
 "description": "Style for ;",
 "superType": "punctuation"
  },
+ {
+"id": "static",
+"description": "Style for statics",
+"superType": "variable"
+ },
+ {
+"id": "toolModule",
+"description": "Style for tool module attributes",
+"superType": "decorator"
+ },
  {
 "id": "typeAlias",
 "description": "Style for type aliases",
@@ -2064,10 +2084,18 @@
 "id": "library",
 "description": "Style for items that are defined outside of the current crate"
  },
+ {
+"id": "macro",
+"description": "Style for tokens inside of macro calls"
+ },
  {
 "id": "mutable",
 "description": "Style for mutable locals and statics as well as functions taking `&mut self`"
  },
+ {
+"id": "procMacro",
+"description": "Style for tokens inside of proc-macro calls"
+ },
  {
 "id": "public",
 "description": "Style for items that are from the current crate and are `pub`"