4 files changed, 110 insertions, 103 deletions

diff --git a/editors/code/.vscodeignore b/editors/code/.vscodeignore
index 17c378a49..ac411f8e2 100644
--- a/editors/code/.vscodeignore
+++ b/editors/code/.vscodeignore
@@ -2,5 +2,6 @@
 !out/main.js
 !package.json
 !package-lock.json
+!ra_syntax_tree.tmGrammar.json
 !icon.png
 !README.md
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 2d8b432a7..eb4f299a1 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -115,25 +115,25 @@
             "dev": true
         },
         "@typescript-eslint/eslint-plugin": {
-            "version": "2.26.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.26.0.tgz",
-            "integrity": "sha512-4yUnLv40bzfzsXcTAtZyTjbiGUXMrcIJcIMioI22tSOyAxpdXiZ4r7YQUU8Jj6XXrLz9d5aMHPQf5JFR7h27Nw==",
+            "version": "2.27.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.27.0.tgz",
+            "integrity": "sha512-/my+vVHRN7zYgcp0n4z5A6HAK7bvKGBiswaM5zIlOQczsxj/aiD7RcgD+dvVFuwFaGh5+kM7XA6Q6PN0bvb1tw==",
             "dev": true,
             "requires": {
-                "@typescript-eslint/experimental-utils": "2.26.0",
+                "@typescript-eslint/experimental-utils": "2.27.0",
                 "functional-red-black-tree": "^1.0.1",
                 "regexpp": "^3.0.0",
                 "tsutils": "^3.17.1"
             }
         },
         "@typescript-eslint/experimental-utils": {
-            "version": "2.26.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz",
-            "integrity": "sha512-RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ==",
+            "version": "2.27.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz",
+            "integrity": "sha512-vOsYzjwJlY6E0NJRXPTeCGqjv5OHgRU1kzxHKWJVPjDYGbPgLudBXjIlc+OD1hDBZ4l1DLbOc5VjofKahsu9Jw==",
             "dev": true,
             "requires": {
                 "@types/json-schema": "^7.0.3",
-                "@typescript-eslint/typescript-estree": "2.26.0",
+                "@typescript-eslint/typescript-estree": "2.27.0",
                 "eslint-scope": "^5.0.0",
                 "eslint-utils": "^2.0.0"
             },
@@ -150,21 +150,21 @@
             }
         },
         "@typescript-eslint/parser": {
-            "version": "2.26.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.26.0.tgz",
-            "integrity": "sha512-+Xj5fucDtdKEVGSh9353wcnseMRkPpEAOY96EEenN7kJVrLqy/EVwtIh3mxcUz8lsFXW1mT5nN5vvEam/a5HiQ==",
+            "version": "2.27.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.27.0.tgz",
+            "integrity": "sha512-HFUXZY+EdwrJXZo31DW4IS1ujQW3krzlRjBrFRrJcMDh0zCu107/nRfhk/uBasO8m0NVDbBF5WZKcIUMRO7vPg==",
             "dev": true,
             "requires": {
                 "@types/eslint-visitor-keys": "^1.0.0",
-                "@typescript-eslint/experimental-utils": "2.26.0",
-                "@typescript-eslint/typescript-estree": "2.26.0",
+                "@typescript-eslint/experimental-utils": "2.27.0",
+                "@typescript-eslint/typescript-estree": "2.27.0",
                 "eslint-visitor-keys": "^1.1.0"
             }
         },
         "@typescript-eslint/typescript-estree": {
-            "version": "2.26.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz",
-            "integrity": "sha512-3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg==",
+            "version": "2.27.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz",
+            "integrity": "sha512-t2miCCJIb/FU8yArjAvxllxbTiyNqaXJag7UOpB5DVoM3+xnjeOngtqlJkLRnMtzaRcJhe3CIR9RmL40omubhg==",
             "dev": true,
             "requires": {
                 "debug": "^4.1.1",
@@ -459,12 +459,6 @@
             "integrity": "sha1-OjYof1A05pnnV3kBBSwubJQlFjE=",
             "dev": true
         },
-        "didyoumean": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz",
-            "integrity": "sha1-6S7f2tplN9SE1zwBcv0eugxJdv8=",
-            "dev": true
-        },
         "doctrine": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -1043,6 +1037,12 @@
             "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz",
             "integrity": "sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w=="
         },
+        "leven": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+            "dev": true
+        },
         "levn": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -1088,16 +1088,24 @@
             }
         },
         "markdown-it": {
-            "version": "8.4.2",
-            "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
-            "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
+            "version": "10.0.0",
+            "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
+            "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
             "dev": true,
             "requires": {
                 "argparse": "^1.0.7",
-                "entities": "~1.1.1",
+                "entities": "~2.0.0",
                 "linkify-it": "^2.0.0",
                 "mdurl": "^1.0.1",
                 "uc.micro": "^1.0.5"
+            },
+            "dependencies": {
+                "entities": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+                    "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+                    "dev": true
+                }
             }
         },
         "mdurl": {
@@ -1359,9 +1367,9 @@
             }
         },
         "regexpp": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz",
-            "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+            "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
             "dev": true
         },
         "resolve": {
@@ -1399,9 +1407,9 @@
             }
         },
         "rollup": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.3.2.tgz",
-            "integrity": "sha512-p66+fbfaUUOGE84sHXAOgfeaYQMslgAazoQMp//nlR519R61213EPFgrMZa48j31jNacJwexSAR1Q8V/BwGKBA==",
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.3.3.tgz",
+            "integrity": "sha512-uJ9VNWk80mb4wDCSfd1AyHoSc9TrWbkZtnO6wbsMTp9muSWkT26Dvc99MX1yGCOTvUN1Skw/KpFzKdUDuZKTXA==",
             "dev": true,
             "requires": {
                 "fsevents": "~2.1.2"
@@ -1723,9 +1731,9 @@
             "dev": true
         },
         "vsce": {
-            "version": "1.74.0",
-            "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.74.0.tgz",
-            "integrity": "sha512-8zWM9bZBNn9my40kkxAxdY4nhb9ADfazXsyDgx1thbRaLPbmPTlmqQ55vCAyWYFEi6XbJv8w599vzVUqsU1gHg==",
+            "version": "1.75.0",
+            "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.75.0.tgz",
+            "integrity": "sha512-qyAQTmolxKWc9bV1z0yBTSH4WEIWhDueBJMKB0GUFD6lM4MiaU1zJ9BtzekUORZu094YeNSKz0RmVVuxfqPq0g==",
             "dev": true,
             "requires": {
                 "azure-devops-node-api": "^7.2.0",
@@ -1733,10 +1741,10 @@
                 "cheerio": "^1.0.0-rc.1",
                 "commander": "^2.8.1",
                 "denodeify": "^1.2.1",
-                "didyoumean": "^1.2.1",
                 "glob": "^7.0.6",
+                "leven": "^3.1.0",
                 "lodash": "^4.17.15",
-                "markdown-it": "^8.3.1",
+                "markdown-it": "^10.0.0",
                 "mime": "^1.3.4",
                 "minimatch": "^3.0.3",
                 "osenv": "^0.1.3",
diff --git a/editors/code/package.json b/editors/code/package.json
index 1f95cd130..94edc6eeb 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -42,14 +42,14 @@
         "@types/node": "^12.12.34",
         "@types/node-fetch": "^2.5.5",
         "@types/vscode": "^1.43.0",
-        "@typescript-eslint/eslint-plugin": "^2.26.0",
-        "@typescript-eslint/parser": "^2.26.0",
+        "@typescript-eslint/eslint-plugin": "^2.27.0",
+        "@typescript-eslint/parser": "^2.27.0",
         "eslint": "^6.8.0",
-        "rollup": "^2.3.2",
+        "rollup": "^2.3.3",
         "tslib": "^1.11.1",
         "typescript": "^3.8.3",
         "typescript-formatter": "^7.2.2",
-        "vsce": "^1.74.0"
+        "vsce": "^1.75.0"
     },
     "activationEvents": [
         "onLanguage:rust",
@@ -211,10 +211,12 @@
                 },
                 "rust-analyzer.notifications.workspaceLoaded": {
                     "type": "boolean",
+                    "default": true,
                     "markdownDescription": "Whether to show `workspace loaded` message."
                 },
                 "rust-analyzer.notifications.cargoTomlNotFound": {
                     "type": "boolean",
+                    "default": true,
                     "markdownDescription": "Whether to show `can't find Cargo.toml` error message"
                 },
                 "rust-analyzer.cargo.noDefaultFeatures": {
@@ -248,6 +250,18 @@
                     "default": [],
                     "description": "Additional arguments to rustfmt"
                 },
+                "rust-analyzer.rustfmt.overrideCommand": {
+                    "type": [
+                        "null",
+                        "array"
+                    ],
+                    "items": {
+                        "type": "string",
+                        "minItems": 1
+                    },
+                    "default": null,
+                    "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for formatting."
+                },
                 "rust-analyzer.checkOnSave.enable": {
                     "type": "boolean",
                     "default": true,
@@ -266,6 +280,18 @@
                     "default": "check",
                     "markdownDescription": "Cargo command to use for `cargo check`"
                 },
+                "rust-analyzer.checkOnSave.overrideCommand": {
+                    "type": [
+                        "null",
+                        "array"
+                    ],
+                    "items": {
+                        "type": "string",
+                        "minItems": 1
+                    },
+                    "default": null,
+                    "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for checking. The command should include `--message=format=json` or similar option."
+                },
                 "rust-analyzer.checkOnSave.allTargets": {
                     "type": "boolean",
                     "default": true,
@@ -313,6 +339,7 @@
                 },
                 "rust-analyzer.callInfo.full": {
                     "type": "boolean",
+                    "default": true,
                     "description": "Show function name and docs in parameter hints"
                 },
                 "rust-analyzer.highlighting.semanticTokens": {
@@ -474,7 +501,8 @@
             },
             {
                 "id": "builtinType",
-                "description": "Style for builtin types"
+                "description": "Style for builtin types",
+                "superType": "type"
             },
             {
                 "id": "lifetime",
@@ -482,11 +510,13 @@
             },
             {
                 "id": "typeAlias",
-                "description": "Style for type aliases"
+                "description": "Style for type aliases",
+                "superType": "type"
             },
             {
                 "id": "union",
-                "description": "Style for C-style untagged unions"
+                "description": "Style for C-style untagged unions",
+                "superType": "type"
             }
         ],
         "semanticTokenModifiers": [
@@ -495,7 +525,7 @@
                 "description": "Style for compile-time constants"
             },
             {
-                "id": "control",
+                "id": "controlFlow",
                 "description": "Style for control flow keywords"
             },
             {
@@ -507,65 +537,31 @@
                 "description": "Style for unsafe operations"
             }
         ],
-        "semanticTokenStyleDefaults": [
-            {
-                "selector": "attribute",
-                "scope": [
-                    "meta.attribute"
-                ]
-            },
-            {
-                "selector": "builtinType",
-                "scope": [
-                    "support.type.primitive"
-                ]
-            },
+        "semanticTokenScopes": [
             {
-                "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"
+                    ],
+                    "variable.constant": [
+                        "entity.name.constant"
+                    ]
                 }
             }
         ]
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 4f3b89f44..efd56a84b 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -177,6 +177,8 @@ async function bootstrapServer(config: Config, state: PersistentState): Promise<
         );
     }
 
+    log.debug("Using server binary at", path);
+
     const res = spawnSync(path, ["--version"], { encoding: 'utf8' });
     log.debug("Checked binary availability via --version", res);
     log.debug(res, "--version output:", res.output);