1 files changed, 184 insertions, 186 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index ba31c4e63..14bdec8c2 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -45,7 +45,7 @@
         "@typescript-eslint/eslint-plugin": "^2.26.0",
         "@typescript-eslint/parser": "^2.26.0",
         "eslint": "^6.8.0",
-        "rollup": "^2.3.1",
+        "rollup": "^2.3.2",
         "tslib": "^1.11.1",
         "typescript": "^3.8.3",
         "typescript-formatter": "^7.2.2",
@@ -177,91 +177,70 @@
             "type": "object",
             "title": "Rust Analyzer",
             "properties": {
-                "rust-analyzer.highlighting.semanticTokens": {
+                "rust-analyzer.diagnostics.enable": {
                     "type": "boolean",
-                    "default": false,
-                    "description": "Use proposed semantic tokens API for syntax highlighting"
-                },
-                "rust-analyzer.highlightingOn": {
-                    "type": "boolean",
-                    "default": false,
-                    "description": "Highlight Rust code (overrides built-in syntax highlighting)"
-                },
-                "rust-analyzer.rainbowHighlightingOn": {
-                    "type": "boolean",
-                    "default": false,
-                    "description": "When highlighting Rust code, use a unique color per identifier"
+                    "default": true,
+                    "markdownDescription": "Whether to show native rust-analyzer diagnostics."
                 },
-                "rust-analyzer.featureFlags": {
-                    "type": "object",
-                    "default": {},
-                    "description": "Fine grained feature flags to disable annoying features",
-                    "properties": {
-                        "lsp.diagnostics": {
-                            "type": "boolean",
-                            "markdownDescription": "Whether to show diagnostics from `cargo check`"
-                        },
-                        "completion.insertion.add-call-parenthesis": {
-                            "type": "boolean",
-                            "description": "Whether to add parenthesis when completing functions"
-                        },
-                        "completion.insertion.add-argument-snippets": {
-                            "type": "boolean",
-                            "description": "Whether to add argument snippets when completing functions"
-                        },
-                        "completion.enable-postfix": {
-                            "type": "boolean",
-                            "markdownDescription": "Whether to show postfix snippets like `dbg`, `if`, `not`, etc."
-                        },
-                        "call-info.full": {
-                            "type": "boolean",
-                            "description": "Show function name and docs in parameter hints"
-                        },
-                        "notifications.workspace-loaded": {
-                            "type": "boolean",
-                            "markdownDescription": "Whether to show `workspace loaded` message"
-                        },
-                        "notifications.cargo-toml-not-found": {
-                            "type": "boolean",
-                            "markdownDescription": "Whether to show `can't find Cargo.toml` error message"
-                        }
-                    }
+                "rust-analyzer.lruCapacity": {
+                    "type": [
+                        "null",
+                        "integer"
+                    ],
+                    "default": null,
+                    "minimum": 0,
+                    "exclusiveMinimum": true,
+                    "description": "Number of syntax trees rust-analyzer keeps in memory."
                 },
-                "rust-analyzer.updates.channel": {
+                "rust-analyzer.files.watcher": {
                     "type": "string",
                     "enum": [
-                        "stable",
-                        "nightly"
-                    ],
-                    "default": "stable",
-                    "markdownEnumDescriptions": [
-                        "`\"stable\"` updates are shipped weekly, they don't contain cutting-edge features from VSCode proposed APIs but have less bugs in general",
-                        "`\"nightly\"` updates are shipped daily (extension updates automatically by downloading artifacts directly from GitHub), they contain cutting-edge features and latest bug fixes. These releases help us get your feedback very quickly and speed up rust-analyzer development **drastically**"
+                        "client",
+                        "notify"
                     ],
-                    "markdownDescription": "Choose `\"nightly\"` updates to get the latest features and bug fixes every day. While `\"stable\"` releases occur weekly and don't contain cutting-edge features from VSCode proposed APIs"
+                    "default": "client",
+                    "description": "Controls file watching implementation."
                 },
-                "rust-analyzer.updates.askBeforeDownload": {
+                "rust-analyzer.files.exclude": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "default": [],
+                    "description": "Paths to exclude from analysis."
+                },
+                "rust-analyzer.notifications.workspaceLoaded": {
                     "type": "boolean",
-                    "default": true,
-                    "description": "Whether to ask for permission before downloading any files from the Internet"
+                    "markdownDescription": "Whether to show `workspace loaded` message."
                 },
-                "rust-analyzer.serverPath": {
-                    "type": [
-                        "null",
-                        "string"
-                    ],
-                    "default": null,
-                    "description": "Path to rust-analyzer executable (points to bundled binary by default). If this is set, then \"rust-analyzer.updates.channel\" setting is not used"
+                "rust-analyzer.notifications.cargoTomlNotFound": {
+                    "type": "boolean",
+                    "markdownDescription": "Whether to show `can't find Cargo.toml` error message"
+                },
+                "rust-analyzer.cargo.noDefaultFeatures": {
+                    "type": "boolean",
+                    "default": false,
+                    "markdownDescription": "Do not activate the `default` feature"
+                },
+                "rust-analyzer.cargo.allFeatures": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Activate all available features"
                 },
-                "rust-analyzer.excludeGlobs": {
+                "rust-analyzer.cargo.features": {
                     "type": "array",
                     "items": {
                         "type": "string"
                     },
                     "default": [],
-                    "description": "Paths to exclude from analysis"
+                    "description": "List of features to activate"
+                },
+                "rust-analyzer.cargo.loadOutDirsFromCheck": {
+                    "type": "boolean",
+                    "default": false,
+                    "markdownDescription": "Run `cargo check` on startup to get the correct value for package OUT_DIRs"
                 },
-                "rust-analyzer.rustfmtArgs": {
+                "rust-analyzer.rustfmt.extraArgs": {
                     "type": "array",
                     "items": {
                         "type": "string"
@@ -269,64 +248,42 @@
                     "default": [],
                     "description": "Additional arguments to rustfmt"
                 },
-                "rust-analyzer.useClientWatching": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "client provided file watching instead of notify watching."
+                "rust-analyzer.rustfmt.overrideCommand": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for formatting."
                 },
-                "rust-analyzer.cargo-watch.enable": {
+                "rust-analyzer.checkOnSave.enable": {
                     "type": "boolean",
                     "default": true,
-                    "markdownDescription": "Run specified `cargo-watch` command for diagnostics on save"
+                    "markdownDescription": "Run specified `cargo check` command for diagnostics on save"
                 },
-                "rust-analyzer.cargo-watch.arguments": {
+                "rust-analyzer.checkOnSave.extraArgs": {
                     "type": "array",
                     "items": {
                         "type": "string"
                     },
-                    "markdownDescription": "`cargo-watch` arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )",
+                    "markdownDescription": "Extra arguments for `cargo check`",
                     "default": []
                 },
-                "rust-analyzer.cargo-watch.command": {
+                "rust-analyzer.checkOnSave.command": {
                     "type": "string",
-                    "markdownDescription": "`cargo-watch` command. (e.g: `clippy` will run as `cargo watch -x clippy` )",
-                    "default": "check"
+                    "default": "check",
+                    "markdownDescription": "Cargo command to use for `cargo check`"
                 },
-                "rust-analyzer.cargo-watch.allTargets": {
-                    "type": "boolean",
-                    "markdownDescription": "Check all targets and tests (will be passed as `--all-targets`)",
-                    "default": true
-                },
-                "rust-analyzer.trace.server": {
-                    "type": "string",
-                    "scope": "window",
-                    "enum": [
-                        "off",
-                        "messages",
-                        "verbose"
-                    ],
-                    "enumDescriptions": [
-                        "No traces",
-                        "Error only",
-                        "Full log"
-                    ],
-                    "default": "off",
-                    "description": "Trace requests to the rust-analyzer"
+                "rust-analyzer.checkOnSave.overrideCommand": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for checking. The command should include `--message=format=json` or similar option."
                 },
-                "rust-analyzer.trace.extension": {
-                    "description": "Enable logging of VS Code extensions itself",
+                "rust-analyzer.checkOnSave.allTargets": {
                     "type": "boolean",
-                    "default": false
-                },
-                "rust-analyzer.lruCapacity": {
-                    "type": [
-                        "null",
-                        "integer"
-                    ],
-                    "default": null,
-                    "minimum": 0,
-                    "exclusiveMinimum": true,
-                    "description": "Number of syntax trees rust-analyzer keeps in memory"
+                    "default": true,
+                    "markdownDescription": "Check all targets and tests (will be passed as `--all-targets`)"
                 },
                 "rust-analyzer.inlayHints.typeHints": {
                     "type": "boolean",
@@ -353,28 +310,76 @@
                     "exclusiveMinimum": true,
                     "description": "Maximum length for inlay hints"
                 },
-                "rust-analyzer.cargoFeatures.noDefaultFeatures": {
+                "rust-analyzer.completion.addCallParenthesis": {
                     "type": "boolean",
-                    "default": false,
-                    "markdownDescription": "Do not activate the `default` feature"
+                    "default": true,
+                    "description": "Whether to add parenthesis when completing functions"
                 },
-                "rust-analyzer.cargoFeatures.allFeatures": {
+                "rust-analyzer.completion.addCallArgumentSnippets": {
                     "type": "boolean",
                     "default": true,
-                    "description": "Activate all available features"
+                    "description": "Whether to add argument snippets when completing functions"
                 },
-                "rust-analyzer.cargoFeatures.features": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    },
-                    "default": [],
-                    "description": "List of features to activate"
+                "rust-analyzer.completion.postfix.enable": {
+                    "type": "boolean",
+                    "default": true,
+                    "markdownDescription": "Whether to show postfix snippets like `dbg`, `if`, `not`, etc."
                 },
-                "rust-analyzer.cargoFeatures.loadOutDirsFromCheck": {
+                "rust-analyzer.callInfo.full": {
+                    "type": "boolean",
+                    "description": "Show function name and docs in parameter hints"
+                },
+                "rust-analyzer.highlighting.semanticTokens": {
                     "type": "boolean",
                     "default": false,
-                    "markdownDescription": "Run `cargo check` on startup to get the correct value for package OUT_DIRs"
+                    "description": "Use proposed semantic tokens API for syntax highlighting"
+                },
+                "rust-analyzer.updates.channel": {
+                    "type": "string",
+                    "enum": [
+                        "stable",
+                        "nightly"
+                    ],
+                    "default": "stable",
+                    "markdownEnumDescriptions": [
+                        "`\"stable\"` updates are shipped weekly, they don't contain cutting-edge features from VSCode proposed APIs but have less bugs in general",
+                        "`\"nightly\"` updates are shipped daily (extension updates automatically by downloading artifacts directly from GitHub), they contain cutting-edge features and latest bug fixes. These releases help us get your feedback very quickly and speed up rust-analyzer development **drastically**"
+                    ],
+                    "markdownDescription": "Choose `\"nightly\"` updates to get the latest features and bug fixes every day. While `\"stable\"` releases occur weekly and don't contain cutting-edge features from VSCode proposed APIs"
+                },
+                "rust-analyzer.updates.askBeforeDownload": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether to ask for permission before downloading any files from the Internet"
+                },
+                "rust-analyzer.serverPath": {
+                    "type": [
+                        "null",
+                        "string"
+                    ],
+                    "default": null,
+                    "description": "Path to rust-analyzer executable (points to bundled binary by default). If this is set, then \"rust-analyzer.updates.channel\" setting is not used"
+                },
+                "rust-analyzer.trace.server": {
+                    "type": "string",
+                    "scope": "window",
+                    "enum": [
+                        "off",
+                        "messages",
+                        "verbose"
+                    ],
+                    "enumDescriptions": [
+                        "No traces",
+                        "Error only",
+                        "Full log"
+                    ],
+                    "default": "off",
+                    "description": "Trace requests to the rust-analyzer"
+                },
+                "rust-analyzer.trace.extension": {
+                    "description": "Enable logging of VS Code extensions itself",
+                    "type": "boolean",
+                    "default": false
                 }
             }
         },
@@ -411,6 +416,21 @@
                 ]
             }
         ],
+        "languages": [
+            {
+                "id": "ra_syntax_tree",
+                "extensions": [
+                    ".rast"
+                ]
+            }
+        ],
+        "grammars": [
+            {
+                "language": "ra_syntax_tree",
+                "scopeName": "source.ra_syntax_tree",
+                "path": "ra_syntax_tree.tmGrammar.json"
+            }
+        ],
         "problemMatchers": [
             {
                 "name": "rustc",
@@ -450,6 +470,15 @@
                     "light": "#747474",
                     "highContrast": "#BEBEBE"
                 }
+            },
+            {
+                "id": "rust_analyzer.syntaxTreeBorder",
+                "description": "Color of the border displayed in the Rust source code for the selected syntax node (see \"Show Syntax Tree\" command)",
+                "defaults": {
+                    "dark": "#ffffff",
+                    "light": "#b700ff",
+                    "highContrast": "#b700ff"
+                }
             }
         ],
         "semanticTokenTypes": [
@@ -492,65 +521,34 @@
                 "description": "Style for unsafe operations"
             }
         ],
-        "semanticTokenStyleDefaults": [
+        "semanticTokenScopes": [
             {
-                "selector": "attribute",
-                "scope": [
-                    "meta.attribute"
-                ]
-            },
-            {
-                "selector": "builtinType",
-                "scope": [
-                    "support.type.primitive"
-                ]
-            },
-            {
-                "selector": "lifetime",
-                "scope": [
-                    "entity.name.lifetime.rust"
-                ]
-            },
-            {
-                "selector": "typeAlias",
-                "scope": [
-                    "entity.name.typeAlias"
-                ]
-            },
-            {
-                "selector": "union",
-                "scope": [
-                    "entity.name.union"
-                ]
-            },
-            {
-                "selector": "keyword.unsafe",
-                "scope": [
-                    "keyword.other.unsafe"
-                ]
-            },
-            {
-                "selector": "keyword.control",
-                "scope": [
-                    "keyword.control"
-                ]
-            },
-            {
-                "selector": "variable.constant",
-                "scope": [
-                    "entity.name.constant"
-                ]
-            },
-            {
-                "selector": "*.mutable",
-                "light": {
-                    "fontStyle": "underline"
-                },
-                "dark": {
-                    "fontStyle": "underline"
-                },
-                "highContrast": {
-                    "fontStyle": "underline"
+                "language": "rust",
+                "scopes": {
+                    "attribute": [
+                        "meta.attribute"
+                    ],
+                    "builtinType": [
+                        "support.type.primitive"
+                    ],
+                    "lifetime": [
+                        "entity.name.lifetime.rust"
+                    ],
+                    "typeAlias": [
+                        "entity.name.typeAlias"
+                    ],
+                    "union": [
+                        "entity.name.union"
+                    ],
+                    "keyword.unsafe": [
+                        "keyword.other.unsafe"
+                    ],
+                    "keyword.control": [
+                        "keyword.control"
+                    ],
+                    "variable.constant": [
+                        "entity.name.constant"
+                    ]
                 }
             }
         ]