From e665ec7be83b72f7586b30387cd87c8faf62b9e1 Mon Sep 17 00:00:00 2001
From: Dhruv Manilawala <dhruvmanila@gmail.com>
Date: Fri, 5 Jul 2024 17:09:00 +0530
Subject: [PATCH] Return early if Python version check fails (#517)

## Summary

This is a follow-up from #516 and adopted from
https://github.com/microsoft/vscode-python-tools-extension-template/commit/723f297671b4409e40ebbf820cb5d507d923f066.

## Test Plan

Same test plan as #516 but validate that the script failure doesn't
occur now that we exit early.
---
 src/extension.ts | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index 50211d6..ce8085d 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -87,22 +87,21 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     restartInProgress = true;
 
     const interpreter = getInterpreterFromSetting(serverId);
-    if (
-      interpreter !== undefined &&
-      interpreter.length > 0 &&
-      checkVersion(await resolveInterpreter(interpreter))
-    ) {
-      traceVerbose(
-        `Using interpreter from ${serverInfo.module}.interpreter: ${interpreter.join(" ")}`,
-      );
-      lsClient = await restartServer(serverId, serverName, outputChannel, lsClient);
+    if (interpreter !== undefined && interpreter.length > 0) {
+      if (checkVersion(await resolveInterpreter(interpreter))) {
+        traceVerbose(
+          `Using interpreter from ${serverInfo.module}.interpreter: ${interpreter.join(" ")}`,
+        );
+        lsClient = await restartServer(serverId, serverName, outputChannel, lsClient);
 
-      restartInProgress = false;
-      if (restartQueued) {
-        restartQueued = false;
-        await runServer();
+        restartInProgress = false;
+        if (restartQueued) {
+          restartQueued = false;
+          await runServer();
+        }
       }
 
+      restartInProgress = false;
       return;
     }