aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-01-07 14:39:50 +0000
committerGitHub <[email protected]>2021-01-07 14:39:50 +0000
commitaa9bef07971493e3edd8f9179d05920cbfc8160b (patch)
tree6df3bba47d9184f4fffea7497e29298196150a15
parent7967ce85cfc5fc2b1996425b44f2a45d0841c8ff (diff)
parentc547ec1cd6fb764d7ad7c1e8b066b90038b44920 (diff)
Merge #7194
7194: Don't update the server if managed by the user r=matklad a=lnicola Fixes #7187 CC @figsoda Co-authored-by: LaurenČ›iu Nicola <[email protected]>
-rw-r--r--editors/code/src/main.ts7
1 files changed, 6 insertions, 1 deletions
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 4c132cabe..694da9409 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -167,6 +167,7 @@ async function bootstrapExtension(config: Config, state: PersistentState): Promi
167 } 167 }
168 return; 168 return;
169 }; 169 };
170 if (serverPath(config) !== null) return;
170 171
171 const now = Date.now(); 172 const now = Date.now();
172 if (config.package.releaseTag === NIGHTLY_TAG) { 173 if (config.package.releaseTag === NIGHTLY_TAG) {
@@ -278,7 +279,7 @@ async function patchelf(dest: PathLike): Promise<void> {
278} 279}
279 280
280async function getServer(config: Config, state: PersistentState): Promise<string | undefined> { 281async function getServer(config: Config, state: PersistentState): Promise<string | undefined> {
281 const explicitPath = process.env.__RA_LSP_SERVER_DEBUG ?? config.serverPath; 282 const explicitPath = serverPath(config);
282 if (explicitPath) { 283 if (explicitPath) {
283 if (explicitPath.startsWith("~/")) { 284 if (explicitPath.startsWith("~/")) {
284 return os.homedir() + explicitPath.slice("~".length); 285 return os.homedir() + explicitPath.slice("~".length);
@@ -351,6 +352,10 @@ async function getServer(config: Config, state: PersistentState): Promise<string
351 return dest; 352 return dest;
352} 353}
353 354
355function serverPath(config: Config): string | null {
356 return process.env.__RA_LSP_SERVER_DEBUG ?? config.serverPath;
357}
358
354async function isNixOs(): Promise<boolean> { 359async function isNixOs(): Promise<boolean> {
355 try { 360 try {
356 const contents = await fs.readFile("/etc/os-release"); 361 const contents = await fs.readFile("/etc/os-release");