about summary refs log tree commit diff
path: root/editors/code/package.json
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-08-21 08:06:50 +0000
committerbors <bors@rust-lang.org>2023-08-21 08:06:50 +0000
commit9b3d03408c66749d56466bb09baf2a7177deb6ce (patch)
tree71f088db8ce8909dac9438e37836c85b6f95938d /editors/code/package.json
parenta3892f0ed9b169351495b0ac871a63bdc5b61317 (diff)
parent887cc48ba8929f7fcc3d43258d5b7c76b1e2f8ea (diff)
downloadrust-9b3d03408c66749d56466bb09baf2a7177deb6ce.tar.gz
rust-9b3d03408c66749d56466bb09baf2a7177deb6ce.zip
Auto merge of #15490 - RalfJung:check-invocation-help, r=Veykril
fix help text for rust-analyzer.check.invocation{Strategy,Location}

I highly doubt that `check.invocationLocation` only has an effect if `cargo.buildScripts.overrideCommand` is set -- looks like a copy-paste mistake from `buildScripts.invocationLocation` to me.
Diffstat (limited to 'editors/code/package.json')
-rw-r--r--editors/code/package.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 83460c82c11..44f1b81675a 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -715,7 +715,7 @@
                     "uniqueItems": true
                 },
                 "rust-analyzer.check.invocationLocation": {
-                    "markdownDescription": "Specifies the working directory for running checks.\n- \"workspace\": run checks for workspaces in the corresponding workspaces' root directories.\n    This falls back to \"root\" if `#rust-analyzer.cargo.checkOnSave.invocationStrategy#` is set to `once`.\n- \"root\": run checks in the project's root directory.\nThis config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`\nis set.",
+                    "markdownDescription": "Specifies the working directory for running checks.\n- \"workspace\": run checks for workspaces in the corresponding workspaces' root directories.\n    This falls back to \"root\" if `#rust-analyzer.cargo.check.invocationStrategy#` is set to `once`.\n- \"root\": run checks in the project's root directory.\nThis config only has an effect when `#rust-analyzer.cargo.check.overrideCommand#`\nis set.",
                     "default": "workspace",
                     "type": "string",
                     "enum": [
@@ -728,7 +728,7 @@
                     ]
                 },
                 "rust-analyzer.check.invocationStrategy": {
-                    "markdownDescription": "Specifies the invocation strategy to use when running the checkOnSave command.\nIf `per_workspace` is set, the command will be executed for each workspace.\nIf `once` is set, the command will be executed once.\nThis config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`\nis set.",
+                    "markdownDescription": "Specifies the invocation strategy to use when running the check command.\nIf `per_workspace` is set, the command will be executed for each workspace.\nIf `once` is set, the command will be executed once.\nThis config only has an effect when `#rust-analyzer.cargo.check.overrideCommand#`\nis set.",
                     "default": "per_workspace",
                     "type": "string",
                     "enum": [