Make sure PYTHON_BASIC_REPL flag is properly set, unset

Author: anthonykim1

src/client/extensionActivation.ts

@@ -53,7 +53,7 @@ import { DebuggerTypeName } from './debugger/constants';
 import { StopWatch } from './common/utils/stopWatch';
 import { registerReplCommands, registerReplExecuteOnEnter, registerStartNativeReplCommand } from './repl/replCommands';
 import { registerTriggerForTerminalREPL } from './terminals/codeExecution/terminalReplWatcher';
-import { registerBasicRepl, registerPythonStartup } from './terminals/pythonStartup';
+import { registerPythonStartup } from './terminals/pythonStartup';
 import { registerPixiFeatures } from './pythonEnvironments/common/environmentManagers/pixi';
 import { registerCustomTerminalLinkProvider } from './terminals/pythonStartupLinkProvider';
 import { registerEnvExtFeatures } from './envExt/api.internal';
@@ -184,7 +184,6 @@ async function activateLegacy(ext: ExtensionState, startupStopWatch: StopWatch):
             serviceManager.get<ITerminalAutoActivation>(ITerminalAutoActivation).register();
 
             await registerPythonStartup(ext.context);
-            await registerBasicRepl(ext.context);
 
             serviceManager.get<ICodeExecutionManager>(ICodeExecutionManager).registerCommands();
 

src/client/terminals/pythonStartup.ts

@@ -21,8 +21,11 @@ async function applyPythonStartupSetting(context: ExtensionContext): Promise<voi
         const sourcePath = path.join(EXTENSION_ROOT_DIR, 'python_files', 'pythonrc.py');
         await copy(Uri.file(sourcePath), destPath, { overwrite: true });
         context.environmentVariableCollection.replace('PYTHONSTARTUP', destPath.fsPath);
+        // When shell integration is  enabled, we disable PyREPL from cpython.
+        context.environmentVariableCollection.replace('PYTHON_BASIC_REPL', '1');
     } else {
         context.environmentVariableCollection.delete('PYTHONSTARTUP');
+        context.environmentVariableCollection.delete('PYTHON_BASIC_REPL');
     }
 }
 
@@ -36,8 +39,3 @@ export async function registerPythonStartup(context: ExtensionContext): Promise<
         }),
     );
 }
-
-export async function registerBasicRepl(context: ExtensionContext): Promise<void> {
-    // TODO: Configurable by setting
-    context.environmentVariableCollection.replace('PYTHON_BASIC_REPL', '1');
-}

src/test/terminals/shellIntegration/pythonStartup.test.ts

@@ -16,7 +16,7 @@ import {
 } from 'vscode';
 import { assert } from 'chai';
 import * as workspaceApis from '../../../client/common/vscodeApis/workspaceApis';
-import { registerBasicRepl, registerPythonStartup } from '../../../client/terminals/pythonStartup';
+import { registerPythonStartup } from '../../../client/terminals/pythonStartup';
 import { IExtensionContext } from '../../../client/common/types';
 import * as pythonStartupLinkProvider from '../../../client/terminals/pythonStartupLinkProvider';
 import { CustomTerminalLinkProvider } from '../../../client/terminals/pythonStartupLinkProvider';
@@ -135,8 +135,8 @@ suite('Terminal - Shell Integration with PYTHONSTARTUP', () => {
         globalEnvironmentVariableCollection.verify((c) => c.delete('PYTHONSTARTUP'), TypeMoq.Times.once());
     });
 
-    test('PYTHON_BASIC_REPL is set when registerBasicRepl is called', async () => {
-        await registerBasicRepl(context.object);
+    test('PYTHON_BASIC_REPL is set when shell integration is enabled', async () => {
+        await registerPythonStartup(context.object);
         globalEnvironmentVariableCollection.verify(
             (c) => c.replace('PYTHON_BASIC_REPL', '1', TypeMoq.It.isAny()),
             TypeMoq.Times.once(),