about summary refs log tree commit diff
path: root/editors/code/src/bootstrap.ts
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-08-15 11:38:44 +0000
committerbors <bors@rust-lang.org>2023-08-15 11:38:44 +0000
commitef2ee59631f9a0f62ff03b54befdef363675ceed (patch)
treea7d94f8da704a95e9f58a98d26cef7c85d92a8e3 /editors/code/src/bootstrap.ts
parentb771de3fdc1d0eed102336c2f76ca6ced07656ac (diff)
parente76d20e072cd25ca2df21ef51e973bf666f4c840 (diff)
downloadrust-ef2ee59631f9a0f62ff03b54befdef363675ceed.tar.gz
rust-ef2ee59631f9a0f62ff03b54befdef363675ceed.zip
Auto merge of #15446 - Veykril:checkOnSaveToggle, r=Veykril
Add status bar button to toggle check on save state

Closes https://github.com/rust-lang/rust-analyzer/issues/15440
cc https://github.com/rust-lang/rust-analyzer/issues/13208
Diffstat (limited to 'editors/code/src/bootstrap.ts')
-rw-r--r--editors/code/src/bootstrap.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/code/src/bootstrap.ts b/editors/code/src/bootstrap.ts
index ef4dff095cf..6cf399599d9 100644
--- a/editors/code/src/bootstrap.ts
+++ b/editors/code/src/bootstrap.ts
@@ -20,7 +20,7 @@ export async function bootstrap(
 
     log.info("Using server binary at", path);
 
-    if (!isValidExecutable(path)) {
+    if (!isValidExecutable(path, config.serverExtraEnv)) {
         if (config.serverPath) {
             throw new Error(`Failed to execute ${path} --version. \`config.server.path\` or \`config.serverPath\` has been set explicitly.\
             Consider removing this config or making a valid server binary available at that path.`);