From 9f8764ae6919f2c61e2b3863e0f45d5f6434f4b4 Mon Sep 17 00:00:00 2001 From: Anthony Kim Date: Mon, 2 Feb 2026 15:58:39 -0800 Subject: [PATCH 1/4] Set description when contributing PYTHONSTARTUP --- src/client/common/utils/localize.ts | 1 + src/client/terminals/pythonStartup.ts | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts index a084fc647025..6f5613c2c336 100644 --- a/src/client/common/utils/localize.ts +++ b/src/client/common/utils/localize.ts @@ -199,6 +199,7 @@ export namespace Interpreters { export const terminalEnvVarCollectionPrompt = l10n.t( '{0} environment was successfully activated, even though {1} indicator may not be present in the terminal prompt. [Learn more](https://aka.ms/vscodePythonTerminalActivation).', ); + export const shellIntegrationEnvVarCollectionDescription = l10n.t('Enables Python shell integration via'); export const terminalDeactivateProgress = l10n.t('Editing {0}...'); export const restartingTerminal = l10n.t('Restarting terminal and deactivating...'); export const terminalDeactivatePrompt = l10n.t( diff --git a/src/client/terminals/pythonStartup.ts b/src/client/terminals/pythonStartup.ts index f0c3bf89c3b4..e7eb11778d49 100644 --- a/src/client/terminals/pythonStartup.ts +++ b/src/client/terminals/pythonStartup.ts @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -import { ExtensionContext, Uri } from 'vscode'; +import { ExtensionContext, MarkdownString, Uri } from 'vscode'; import * as path from 'path'; import { copy, createDirectory, getConfiguration, onDidChangeConfiguration } from '../common/vscodeApis/workspaceApis'; import { EXTENSION_ROOT_DIR } from '../constants'; +import { Interpreters } from '../common/utils/localize'; async function applyPythonStartupSetting(context: ExtensionContext): Promise { const config = getConfiguration('python'); @@ -23,6 +24,9 @@ async function applyPythonStartupSetting(context: ExtensionContext): Promise Date: Mon, 2 Feb 2026 16:28:14 -0800 Subject: [PATCH 2/4] Modify --- src/client/common/utils/localize.ts | 4 +++- src/client/terminals/pythonStartup.ts | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts index 6f5613c2c336..70cc2005db90 100644 --- a/src/client/common/utils/localize.ts +++ b/src/client/common/utils/localize.ts @@ -199,7 +199,9 @@ export namespace Interpreters { export const terminalEnvVarCollectionPrompt = l10n.t( '{0} environment was successfully activated, even though {1} indicator may not be present in the terminal prompt. [Learn more](https://aka.ms/vscodePythonTerminalActivation).', ); - export const shellIntegrationEnvVarCollectionDescription = l10n.t('Enables Python shell integration via'); + export const shellIntegrationEnvVarCollectionDescription = l10n.t( + 'Enables `python.terminal.shellIntegration.enabled` by modifying `PYTHONSTARTUP` and `PYTHON_BASIC_REPL`', + ); export const terminalDeactivateProgress = l10n.t('Editing {0}...'); export const restartingTerminal = l10n.t('Restarting terminal and deactivating...'); export const terminalDeactivatePrompt = l10n.t( diff --git a/src/client/terminals/pythonStartup.ts b/src/client/terminals/pythonStartup.ts index e7eb11778d49..3132308194c7 100644 --- a/src/client/terminals/pythonStartup.ts +++ b/src/client/terminals/pythonStartup.ts @@ -21,12 +21,12 @@ async function applyPythonStartupSetting(context: ExtensionContext): Promise Date: Mon, 2 Feb 2026 16:38:05 -0800 Subject: [PATCH 3/4] add one for delete --- src/client/common/utils/localize.ts | 3 +++ src/client/terminals/pythonStartup.ts | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts index 70cc2005db90..2f7afbcaf5a1 100644 --- a/src/client/common/utils/localize.ts +++ b/src/client/common/utils/localize.ts @@ -202,6 +202,9 @@ export namespace Interpreters { export const shellIntegrationEnvVarCollectionDescription = l10n.t( 'Enables `python.terminal.shellIntegration.enabled` by modifying `PYTHONSTARTUP` and `PYTHON_BASIC_REPL`', ); + export const shellIntegrationDisabledEnvVarCollectionDescription = l10n.t( + 'Disables `python.terminal.shellIntegration.enabled` by removing `PYTHONSTARTUP` and `PYTHON_BASIC_REPL`', + ); export const terminalDeactivateProgress = l10n.t('Editing {0}...'); export const restartingTerminal = l10n.t('Restarting terminal and deactivating...'); export const terminalDeactivatePrompt = l10n.t( diff --git a/src/client/terminals/pythonStartup.ts b/src/client/terminals/pythonStartup.ts index 3132308194c7..b6f68c860b46 100644 --- a/src/client/terminals/pythonStartup.ts +++ b/src/client/terminals/pythonStartup.ts @@ -21,15 +21,18 @@ async function applyPythonStartupSetting(context: ExtensionContext): Promise Date: Mon, 2 Feb 2026 16:39:16 -0800 Subject: [PATCH 4/4] better --- src/client/common/utils/localize.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts index 2f7afbcaf5a1..d108dfddb54b 100644 --- a/src/client/common/utils/localize.ts +++ b/src/client/common/utils/localize.ts @@ -203,7 +203,7 @@ export namespace Interpreters { 'Enables `python.terminal.shellIntegration.enabled` by modifying `PYTHONSTARTUP` and `PYTHON_BASIC_REPL`', ); export const shellIntegrationDisabledEnvVarCollectionDescription = l10n.t( - 'Disables `python.terminal.shellIntegration.enabled` by removing `PYTHONSTARTUP` and `PYTHON_BASIC_REPL`', + 'Disables `python.terminal.shellIntegration.enabled` by unsetting `PYTHONSTARTUP` and `PYTHON_BASIC_REPL`', ); export const terminalDeactivateProgress = l10n.t('Editing {0}...'); export const restartingTerminal = l10n.t('Restarting terminal and deactivating...');