diff options
| author | bors <bors@rust-lang.org> | 2024-10-01 10:36:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-01 10:36:27 +0000 |
| commit | b91eeae55954c4ce48e825a317fc2fe6f3de00b5 (patch) | |
| tree | e37e82a65994fde9ad3bea436bd40968d0d3c4da | |
| parent | 00399ab1f5bdf2820c765e2cf1c277cf35f539af (diff) | |
| parent | 7f8bd7e7acc11178e6eb4ed2f0db718e62f9ec0f (diff) | |
| download | rust-b91eeae55954c4ce48e825a317fc2fe6f3de00b5.tar.gz rust-b91eeae55954c4ce48e825a317fc2fe6f3de00b5.zip | |
Auto merge of #18219 - Veykril:veykril/push-ytnzuvtoswqz, r=Veykril
fix: Fix bootstrap error message being incorrect precedence ...
| -rw-r--r-- | src/tools/rust-analyzer/editors/code/src/bootstrap.ts | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/rust-analyzer/editors/code/src/bootstrap.ts b/src/tools/rust-analyzer/editors/code/src/bootstrap.ts index daead47e942..35867f710d5 100644 --- a/src/tools/rust-analyzer/editors/code/src/bootstrap.ts +++ b/src/tools/rust-analyzer/editors/code/src/bootstrap.ts @@ -23,10 +23,11 @@ export async function bootstrap( if (!isValidExecutable(path, config.serverExtraEnv)) { throw new Error( - `Failed to execute ${path} --version.` + config.serverPath - ? `\`config.server.path\` or \`config.serverPath\` has been set explicitly.\ + `Failed to execute ${path} --version.` + + (config.serverPath + ? `\`config.server.path\` or \`config.serverPath\` has been set explicitly.\ Consider removing this config or making a valid server binary available at that path.` - : "", + : ""), ); } |