From 6d097339d8be17dfdf223f4d2591a1dd8890d973 Mon Sep 17 00:00:00 2001
From: Karthik Nadig <kanadig@microsoft.com>
Date: Tue, 29 Aug 2023 12:41:48 -0700
Subject: [PATCH] Fixes from TPIs

---
 src/client/common/utils/localize.ts                           | 4 +++-
 .../creation/provider/condaCreationProvider.ts                | 2 +-
 .../creation/provider/venvCreationProvider.ts                 | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts
index 4401cab56176..c7bd51181fd1 100644
--- a/src/client/common/utils/localize.ts
+++ b/src/client/common/utils/localize.ts
@@ -468,7 +468,9 @@ export namespace CreateEnv {
         export const recreateDescription = l10n.t('Delete existing ".venv" environment and create a new one');
         export const useExisting = l10n.t('Use Existing');
         export const useExistingDescription = l10n.t('Use existing ".venv" environment with no changes to it');
-        export const existingVenvQuickPickPlaceholder = l10n.t('Use or Recreate existing environment?');
+        export const existingVenvQuickPickPlaceholder = l10n.t(
+            'Choose an option to handle the existing ".venv" environment',
+        );
         export const deletingEnvironmentProgress = l10n.t('Deleting existing ".venv" environment...');
         export const errorDeletingEnvironment = l10n.t('Error while deleting existing ".venv" environment.');
     }
diff --git a/src/client/pythonEnvironments/creation/provider/condaCreationProvider.ts b/src/client/pythonEnvironments/creation/provider/condaCreationProvider.ts
index 74a42808e609..af7e55d53cb1 100644
--- a/src/client/pythonEnvironments/creation/provider/condaCreationProvider.ts
+++ b/src/client/pythonEnvironments/creation/provider/condaCreationProvider.ts
@@ -249,7 +249,7 @@ async function createEnvironment(options?: CreateEnvironmentOptions): Promise<Cr
             } catch (ex) {
                 traceError(ex);
                 showErrorMessageWithLogs(CreateEnv.Conda.errorCreatingEnvironment);
-                throw ex;
+                return { error: ex as Error };
             }
         },
     );
diff --git a/src/client/pythonEnvironments/creation/provider/venvCreationProvider.ts b/src/client/pythonEnvironments/creation/provider/venvCreationProvider.ts
index ba47edcf6f30..a23a94b1d4e9 100644
--- a/src/client/pythonEnvironments/creation/provider/venvCreationProvider.ts
+++ b/src/client/pythonEnvironments/creation/provider/venvCreationProvider.ts
@@ -327,7 +327,7 @@ export class VenvCreationProvider implements CreateEnvironmentProvider {
                 } catch (ex) {
                     traceError(ex);
                     showErrorMessageWithLogs(CreateEnv.Venv.errorCreatingEnvironment);
-                    throw ex;
+                    return { error: ex as Error };
                 }
             },
         );