about summary refs log tree commit diff
path: root/src/tools/rust-analyzer/editors/code/package.json
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-07-17 13:54:44 +0000
committerbors <bors@rust-lang.org>2023-07-17 13:54:44 +0000
commitb3c7a7e749761b61ee587fda5fa24aae444865e9 (patch)
tree125cc4b6c71120b38e29f6e330483b83ca75f206 /src/tools/rust-analyzer/editors/code/package.json
parent1a8d09468f045d75c5072af0a3e9b23443d484dd (diff)
parentd35f6c6c11a01ee0ffb7cf762c6d20e910a7bf0e (diff)
downloadrust-b3c7a7e749761b61ee587fda5fa24aae444865e9.tar.gz
rust-b3c7a7e749761b61ee587fda5fa24aae444865e9.zip
Auto merge of #113791 - lnicola:sync-from-ra, r=lnicola
:arrow_up: `rust-analyzer`

r? `@ghost`
Diffstat (limited to 'src/tools/rust-analyzer/editors/code/package.json')
-rw-r--r--src/tools/rust-analyzer/editors/code/package.json77
1 files changed, 38 insertions, 39 deletions
diff --git a/src/tools/rust-analyzer/editors/code/package.json b/src/tools/rust-analyzer/editors/code/package.json
index ee1f832d323..ffb5dd9079a 100644
--- a/src/tools/rust-analyzer/editors/code/package.json
+++ b/src/tools/rust-analyzer/editors/code/package.json
@@ -26,7 +26,7 @@
         }
     },
     "engines": {
-        "vscode": "^1.66.0"
+        "vscode": "^1.78.0"
     },
     "enabledApiProposals": [],
     "scripts": {
@@ -38,37 +38,32 @@
         "lint": "prettier --check . && eslint -c .eslintrc.js --ext ts ./src ./tests",
         "fix": "prettier --write . && eslint -c .eslintrc.js --ext ts ./src ./tests --fix",
         "pretest": "tsc && npm run build",
-        "test": "cross-env TEST_VARIABLE=test node ./out/tests/runTests.js"
+        "test": "node ./out/tests/runTests.js"
     },
     "dependencies": {
+        "@hpcc-js/wasm": "^2.13.0",
         "anser": "^2.1.1",
-        "d3": "^7.6.1",
+        "d3": "^7.8.5",
         "d3-graphviz": "^5.0.2",
-        "vscode-languageclient": "^8.0.2",
-        "@hpcc-js/wasm": "2.5.0"
+        "vscode-languageclient": "^8.1.0"
     },
     "devDependencies": {
+        "@tsconfig/strictest": "^2.0.1",
         "@types/node": "~16.11.7",
-        "@types/vscode": "~1.66.0",
-        "@typescript-eslint/eslint-plugin": "^5.30.5",
-        "@typescript-eslint/parser": "^5.30.5",
-        "@vscode/test-electron": "^2.1.5",
-        "cross-env": "^7.0.3",
-        "esbuild": "^0.14.48",
-        "eslint": "^8.19.0",
-        "eslint-config-prettier": "^8.5.0",
-        "ovsx": "^0.5.2",
-        "prettier": "^2.7.1",
-        "tslib": "^2.4.0",
-        "typescript": "^4.7.4",
-        "vsce": "^2.9.2"
+        "@types/vscode": "~1.78.1",
+        "@typescript-eslint/eslint-plugin": "^6.0.0",
+        "@typescript-eslint/parser": "^6.0.0",
+        "@vscode/test-electron": "^2.3.3",
+        "@vscode/vsce": "^2.19.0",
+        "esbuild": "^0.18.12",
+        "eslint": "^8.44.0",
+        "eslint-config-prettier": "^8.8.0",
+        "ovsx": "^0.8.2",
+        "prettier": "^3.0.0",
+        "tslib": "^2.6.0",
+        "typescript": "^5.1.6"
     },
     "activationEvents": [
-        "onLanguage:rust",
-        "onCommand:rust-analyzer.analyzerStatus",
-        "onCommand:rust-analyzer.memoryUsage",
-        "onCommand:rust-analyzer.reloadWorkspace",
-        "onCommand:rust-analyzer.startServer",
         "workspaceContains:*/Cargo.toml",
         "workspaceContains:*/rust-project.json"
     ],
@@ -289,6 +284,11 @@
                 "command": "rust-analyzer.revealDependency",
                 "title": "Reveal File",
                 "category": "rust-analyzer"
+            },
+            {
+                "command": "rust-analyzer.viewMemoryLayout",
+                "title": "View Memory Layout",
+                "category": "rust-analyzer"
             }
         ],
         "keybindings": [
@@ -298,11 +298,6 @@
                 "when": "editorTextFocus && editorLangId == rust"
             },
             {
-                "command": "rust-analyzer.matchingBrace",
-                "key": "ctrl+shift+m",
-                "when": "editorTextFocus && editorLangId == rust"
-            },
-            {
                 "command": "rust-analyzer.joinLines",
                 "key": "ctrl+shift+j",
                 "when": "editorTextFocus && editorLangId == rust"
@@ -320,7 +315,7 @@
                     "default": null,
                     "description": "Custom cargo runner extension ID."
                 },
-                "rust-analyzer.runnableEnv": {
+                "rust-analyzer.runnables.extraEnv": {
                     "anyOf": [
                         {
                             "type": "null"
@@ -349,6 +344,16 @@
                     "default": null,
                     "markdownDescription": "Environment variables passed to the runnable launched using `Test` or `Debug` lens or `rust-analyzer.run` command."
                 },
+                "rust-analyzer.runnables.problemMatcher": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "default": [
+                        "$rustc"
+                    ],
+                    "markdownDescription": "Problem matchers to use for `rust-analyzer.run` command, eg `[\"$rustc\", \"$rust-panic\"]`."
+                },
                 "rust-analyzer.server.path": {
                     "type": [
                         "null",
@@ -1646,16 +1651,6 @@
                 "language": "ra_syntax_tree",
                 "scopeName": "source.ra_syntax_tree",
                 "path": "ra_syntax_tree.tmGrammar.json"
-            },
-            {
-                "scopeName": "rustdoc.markdown.injection",
-                "path": "rustdoc.markdown.injection.tmGrammar.json",
-                "injectTo": [
-                    "source.rust"
-                ],
-                "embeddedLanguages": {
-                    "meta.embedded.block.markdown": "text.html.markdown"
-                }
             }
         ],
         "problemMatchers": [
@@ -2077,6 +2072,10 @@
                 {
                     "command": "rust-analyzer.openCargoToml",
                     "when": "inRustProject"
+                },
+                {
+                    "command": "rust-analyzer.viewMemoryLayout",
+                    "when": "inRustProject"
                 }
             ],
             "editor/context": [