Drop obsolete color configurations

diff --git a/editors/code/package.json b/editors/code/package.json
index 9444649f6023c8a9bc0516adca7e3f97f43b9619..269bed0f87a55d12e2666df72fc1ab3e0c72a24e 100644 (file)
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -147,68 +147,6 @@
                     "default": false,
                     "description": "Highlight Rust code (overrides built-in syntax highlighting)"
                 },
-                "rust-analyzer.scopeMappings": {
-                    "type": "object",
-                    "definitions": {},
-                    "properties": {
-                        "comment": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "string": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "keyword": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "keyword.control": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "keyword.unsafe": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "function": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "parameter": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "constant": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "type": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "builtin": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "text": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "attribute": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "literal": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "macro": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "variable": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "variable.mut": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "field": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        },
-                        "module": {
-                            "$ref": "vscode://schemas/textmate-colors#/items/properties/scope"
-                        }
-                    },
-                    "additionalProperties": false,
-                    "description": "Mapping Rust Analyzer scopes to TextMateRule scopes list."
-                },
                 "rust-analyzer.rainbowHighlightingOn": {
                     "type": "boolean",
                     "default": false,
@@ -374,232 +312,7 @@
         ],
         "colors": [
             {
-                "id": "ralsp.comment",
-                "description": "Color for comments",
-                "defaults": {
-                    "dark": "#6A9955",
-                    "light": "#008000",
-                    "highContrast": "#7CA668"
-                }
-            },
-            {
-                "id": "ralsp.string",
-                "description": "Color for strings",
-                "defaults": {
-                    "dark": "#CE9178",
-                    "light": "#A31515",
-                    "highContrast": "#CE9178"
-                }
-            },
-            {
-                "id": "ralsp.keyword",
-                "description": "Color for keywords",
-                "defaults": {
-                    "dark": "#569cd6",
-                    "light": "#0000FF",
-                    "highContrast": "#569CD6"
-                }
-            },
-            {
-                "id": "ralsp.keyword.control",
-                "description": "Color for control keywords",
-                "defaults": {
-                    "dark": "#C586C0",
-                    "light": "#AF00DB",
-                    "highContrast": "#C586C0"
-                }
-            },
-            {
-                "id": "ralsp.keyword.unsafe",
-                "description": "Color for unsafe",
-                "defaults": {
-                    "dark": "#FF3030",
-                    "light": "#FF1010",
-                    "highContrast": "#FF1010"
-                }
-            },
-            {
-                "id": "ralsp.function",
-                "description": "Color for functions",
-                "defaults": {
-                    "dark": "#DCDCAA",
-                    "light": "#795E26",
-                    "highContrast": "#DCDCAA"
-                }
-            },
-            {
-                "id": "ralsp.parameter",
-                "description": "Color for parameters",
-                "defaults": {
-                    "dark": "#9CDCFE",
-                    "light": "#001080",
-                    "highContrast": "#9CDCFE"
-                }
-            },
-            {
-                "id": "ralsp.builtin",
-                "description": "Color for builtins",
-                "defaults": {
-                    "dark": "#DD6718",
-                    "light": "#DD6718",
-                    "highContrast": "#DD6718"
-                }
-            },
-            {
-                "id": "ralsp.text",
-                "description": "Color for text",
-                "defaults": {
-                    "dark": "#D4D4D4",
-                    "light": "#000000",
-                    "highContrast": "#FFFFFF"
-                }
-            },
-            {
-                "id": "ralsp.attribute",
-                "description": "Color for attributes",
-                "defaults": {
-                    "dark": "#9FE9BF",
-                    "light": "#1F4B1F",
-                    "highContrast": "#108010"
-                }
-            },
-            {
-                "id": "ralsp.literal",
-                "description": "Color for literals",
-                "defaults": {
-                    "dark": "#BECEA8",
-                    "light": "#09885A",
-                    "highContrast": "#B5CEA8"
-                }
-            },
-            {
-                "id": "ralsp.literal.numeric",
-                "description": "Color for numeric literals",
-                "defaults": {
-                    "dark": "#BECEA8",
-                    "light": "#09885A",
-                    "highContrast": "#B5CEA8"
-                }
-            },
-            {
-                "id": "ralsp.literal.char",
-                "description": "Color for character literals",
-                "defaults": {
-                    "dark": "#BECEA8",
-                    "light": "#09885A",
-                    "highContrast": "#B5CEA8"
-                }
-            },
-            {
-                "id": "ralsp.literal.byte",
-                "description": "Color for byte literals",
-                "defaults": {
-                    "dark": "#BECEA8",
-                    "light": "#09885A",
-                    "highContrast": "#B5CEA8"
-                }
-            },
-            {
-                "id": "ralsp.macro",
-                "description": "Color for macros",
-                "defaults": {
-                    "dark": "#BFEBBF",
-                    "light": "#DD6718",
-                    "highContrast": "#ED7718"
-                }
-            },
-            {
-                "id": "ralsp.constant",
-                "description": "Color for constants",
-                "defaults": {
-                    "dark": "#569cd6",
-                    "light": "#267cb6",
-                    "highContrast": "#569cd6"
-                }
-            },
-            {
-                "id": "ralsp.type",
-                "description": "Color for other types (traits, aliases..)",
-                "defaults": {
-                    "dark": "#4EC9B0",
-                    "light": "#267F99",
-                    "highContrast": "#4EC9B0"
-                }
-            },
-            {
-                "id": "ralsp.type.builtin",
-                "description": "Color for built-in types (&str, bool, u16, u32)",
-                "defaults": {
-                    "dark": "#4EC9B0",
-                    "light": "#267F99",
-                    "highContrast": "#4EC9B0"
-                }
-            },
-            {
-                "id": "ralsp.type.lifetime",
-                "description": "Color for lifetimes parameters",
-                "defaults": {
-                    "dark": "#4EC9B0",
-                    "light": "#267F99",
-                    "highContrast": "#4EC9B0"
-                }
-            },
-            {
-                "id": "ralsp.type.self",
-                "description": "Color for `Self` param type",
-                "defaults": {
-                    "dark": "#4EC9B0",
-                    "light": "#267F99",
-                    "highContrast": "#4EC9B0"
-                }
-            },
-            {
-                "id": "ralsp.type.param",
-                "description": "Color for type parameters",
-                "defaults": {
-                    "dark": "#4EC9B0",
-                    "light": "#267F99",
-                    "highContrast": "#4EC9B0"
-                }
-            },
-            {
-                "id": "ralsp.field",
-                "description": "Color for fields",
-                "defaults": {
-                    "dark": "#4EC9B0",
-                    "light": "#267F99",
-                    "highContrast": "#4EC9B0"
-                }
-            },
-            {
-                "id": "ralsp.variable",
-                "description": "Color for variables",
-                "defaults": {
-                    "dark": "#4EC9B0",
-                    "light": "#267F99",
-                    "highContrast": "#4EC9B0"
-                }
-            },
-            {
-                "id": "ralsp.variable.mut",
-                "description": "Color for mutable variables",
-                "defaults": {
-                    "dark": "#4EC9B0",
-                    "light": "#267F99",
-                    "highContrast": "#4EC9B0"
-                }
-            },
-            {
-                "id": "ralsp.module",
-                "description": "Color for modules",
-                "defaults": {
-                    "dark": "#D4D4D4",
-                    "light": "#000000",
-                    "highContrast": "#FFFFFF"
-                }
-            },
-            {
-                "id": "ralsp.inlayHint",
+                "id": "rust-analyzer.inlayHint",
                 "description": "Color for inlay hints",
                 "defaults": {
                     "dark": "#A0A0A0F0",

diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts
index a7be97db87681aabdde102ad31455148831a9a28..7575cead04bd95b39aab0fc85f7a175d977ff295 100644 (file)
--- a/editors/code/src/inlay_hints.ts
+++ b/editors/code/src/inlay_hints.ts
@@ -36,7 +36,7 @@ interface InlayHint {
 
 const typeHintDecorationType = vscode.window.createTextEditorDecorationType({
     after: {
-        color: new vscode.ThemeColor('ralsp.inlayHint'),
+        color: new vscode.ThemeColor('rust-analyzer.inlayHint'),
     },
 });