From 0f61888193569f0c2347238b91540ad27e5d290a Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Fri, 30 Jun 2023 00:09:52 -0700
Subject: require python >=3.7, off-by-one err in streaming

---
 extension/src/activation/environmentSetup.ts | 12 ++++++++++--
 extension/src/lang-server/codeLens.ts        |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'extension/src')

diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index b8c23733..2d9afaec 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -66,10 +66,18 @@ async function getPythonPipCommands() {
       vscode.window.showErrorMessage(
         "Continue requires Python3. Please install from https://www.python.org/downloads, reload VS Code, and try again."
       );
-      throw new Error("Python3 is not installed.");
+      throw new Error("Python 3.7 or greater is not installed.");
     }
   }
-  let pipCmd = pythonCmd.endsWith("3") ? "pip3" : "pip";
+
+  const version = stdout.split(" ")[1];
+  if (version < "3.7") {
+    vscode.window.showErrorMessage(
+      "Continue requires Python3 version 3.7 or greater. Please update your Python3 installation, reload VS Code, and try again."
+    );
+    throw new Error("Python3 is not installed.");
+  }
+  const pipCmd = pythonCmd.endsWith("3") ? "pip3" : "pip";
   return [pythonCmd, pipCmd];
 }
 
diff --git a/extension/src/lang-server/codeLens.ts b/extension/src/lang-server/codeLens.ts
index 03a9a0a7..21448e31 100644
--- a/extension/src/lang-server/codeLens.ts
+++ b/extension/src/lang-server/codeLens.ts
@@ -21,12 +21,12 @@ class SuggestionsCodeLensProvider implements vscode.CodeLensProvider {
       codeLenses.push(
         new vscode.CodeLens(range, {
           title: "Accept ✅",
-          command: locked ? "" : "continue.acceptSuggestion",
+          command: "continue.acceptSuggestion",
           arguments: [suggestion],
         }),
         new vscode.CodeLens(range, {
           title: "Reject ❌",
-          command: locked ? "" : "continue.rejectSuggestion",
+          command: "continue.rejectSuggestion",
           arguments: [suggestion],
         })
       );
-- 
cgit v1.2.3-70-g09d2