From 4d17152b31b27a8c851b4b1abaff359044ee9d96 Mon Sep 17 00:00:00 2001
From: Veetaha <gerzoh1@gmail.com>
Date: Mon, 9 Mar 2020 20:14:55 +0200
Subject: vscode: make bailing out on custom serverPath more evident

---
 editors/code/src/installation/extension.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'editors/code/src/installation')

diff --git a/editors/code/src/installation/extension.ts b/editors/code/src/installation/extension.ts
index 7eab68852..a0925acaa 100644
--- a/editors/code/src/installation/extension.ts
+++ b/editors/code/src/installation/extension.ts
@@ -15,6 +15,9 @@ const HEURISTIC_NIGHTLY_RELEASE_PERIOD_IN_HOURS = 25;
  * extension version is what's needed according to `desiredUpdateChannel`.
  */
 export async function ensureProperExtensionVersion(config: Config): Promise<never | void> {
+    // User has built lsp server from sources, she should manage updates manually
+    if (config.serverPath !== null) return;
+
     const currentUpdChannel = config.installedExtensionUpdateChannel;
     const desiredUpdChannel = config.updatesChannel;
 
@@ -23,9 +26,6 @@ export async function ensureProperExtensionVersion(config: Config): Promise<neve
         config.installedNightlyExtensionReleaseDate.set(null);
     }
 
-    // User has built lsp server from sources, she should manage updates manually
-    if (currentUpdChannel === null) return;
-
     if (desiredUpdChannel === UpdatesChannel.Stable) {
         // VSCode should handle updates for stable channel
         if (currentUpdChannel === UpdatesChannel.Stable) return;
-- 
cgit v1.2.3