about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-12-30 12:52:05 +0000
committerGitHub <noreply@github.com>2021-12-30 12:52:05 +0000
commit3d63abf1d868218613f33dc59968d3671f7f14a8 (patch)
treeadcc58da54257bc48099ec3d86a3482e84c40655
parent22ccb1a10409b17cba68fd341656d0f662ee0284 (diff)
parent0182f7451600e1700873549c324f7d13585547f4 (diff)
downloadrust-3d63abf1d868218613f33dc59968d3671f7f14a8.tar.gz
rust-3d63abf1d868218613f33dc59968d3671f7f14a8.zip
Merge #11144
11144: fix: Fix server path on NixOS r=lnicola a=lnicola

See https://github.com/rust-analyzer/rust-analyzer/commit/c0d0ceefb29111732cacf39dbb57fe9f3ce25ee8#commitcomment-62688259.

bors r+

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
-rw-r--r--editors/code/src/main.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index df7580b9bc5..3f9f0b3376e 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -243,8 +243,8 @@ async function getServer(context: vscode.ExtensionContext, config: Config, state
             if (!exists) {
                 await vscode.workspace.fs.copy(bundled, dest);
                 await patchelf(dest);
-                server = dest;
             }
+            server = dest;
         }
         await state.updateServerVersion(config.package.version);
         return server.fsPath;