From fe435ffb2728be87df1bba4d0ef5ae8b9626c120 Mon Sep 17 00:00:00 2001
From: George Fraser <george@fivetran.com>
Date: Sat, 7 Nov 2020 10:50:57 -0800
Subject: Use builtin scopes more

---
 crates/rust-analyzer/src/semantic_tokens.rs | 4 ++--
 editors/code/package.json                   | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/crates/rust-analyzer/src/semantic_tokens.rs b/crates/rust-analyzer/src/semantic_tokens.rs
index e7991fd28..783b3df1e 100644
--- a/crates/rust-analyzer/src/semantic_tokens.rs
+++ b/crates/rust-analyzer/src/semantic_tokens.rs
@@ -40,7 +40,7 @@ macro_rules! define_semantic_token_types {
 define_semantic_token_types![
     (ATTRIBUTE, "attribute"),
     (BOOLEAN, "boolean"),
-    (BUILTIN_TYPE, "builtinType"),
+    (BUILTIN_TYPE, "type.defaultLibrary"),
     (ESCAPE_SEQUENCE, "escapeSequence"),
     (FORMAT_SPECIFIER, "formatSpecifier"),
     (GENERIC, "generic"),
@@ -70,7 +70,7 @@ macro_rules! define_semantic_token_modifiers {
 }
 
 define_semantic_token_modifiers![
-    (CONSTANT, "constant"),
+    (CONSTANT, "readonly"),
     (CONTROL_FLOW, "controlFlow"),
     (INJECTED, "injected"),
     (MUTABLE, "mutable"),
diff --git a/editors/code/package.json b/editors/code/package.json
index eccafccdd..02d352124 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -939,9 +939,6 @@
             {
                 "language": "rust",
                 "scopes": {
-                    "macro": [
-                        "entity.name.function.macro.rust"
-                    ],
                     "attribute": [
                         "meta.attribute.rust"
                     ],
@@ -951,9 +948,6 @@
                     "boolean": [
                         "constant.language.boolean.rust"
                     ],
-                    "builtinType": [
-                        "support.type.primitive.rust"
-                    ],
                     "lifetime": [
                         "storage.modifier.lifetime.rust"
                     ],
@@ -972,9 +966,6 @@
                     "keyword.controlFlow": [
                         "keyword.control.rust"
                     ],
-                    "variable.constant": [
-                        "variable.other.constant.rust"
-                    ],
                     "formatSpecifier": [
                         "punctuation.section.embedded.rust"
                     ],
-- 
cgit v1.2.3