Merge branch 'main' into vscode-python-issue-25609-scrollable-repl

Author: dmitrivMS

.github/workflows/pr-file-check.yml

@@ -9,7 +9,8 @@ on:
       - 'labeled'
       - 'unlabeled'
 
-permissions: {}
+permissions:
+  pull-requests: read
 
 jobs:
   changed-files-in-pr:
@@ -19,6 +20,7 @@ jobs:
       - name: 'package-lock.json matches package.json'
         uses: brettcannon/check-for-changed-files@d85c64d17b3c1d0ac57c9cc46ea39399b0d6fa71 # v1.2.2
         with:
+          token: ${{ github.token }}
           prereq-pattern: 'package.json'
           file-pattern: 'package-lock.json'
           skip-label: 'skip package*.json'
@@ -27,6 +29,7 @@ jobs:
       - name: 'package.json matches package-lock.json'
         uses: brettcannon/check-for-changed-files@d85c64d17b3c1d0ac57c9cc46ea39399b0d6fa71 # v1.2.2
         with:
+          token: ${{ github.token }}
           prereq-pattern: 'package-lock.json'
           file-pattern: 'package.json'
           skip-label: 'skip package*.json'
@@ -35,6 +38,7 @@ jobs:
       - name: 'Tests'
         uses: brettcannon/check-for-changed-files@d85c64d17b3c1d0ac57c9cc46ea39399b0d6fa71 # v1.2.2
         with:
+          token: ${{ github.token }}
           prereq-pattern: src/**/*.ts
           file-pattern: |
             src/**/*.test.ts

package-lock.json

@@ -218,7 +218,7 @@ export namespace Interpreters {
         '{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.terminal.shellIntegration.enabled` by modifying `PYTHONSTARTUP` and `PYTHON_BASIC_REPL`',
+        'Enables `python.terminal.shellIntegration.enabled` by modifying `PYTHONSTARTUP`',
     );
     export const shellIntegrationDisabledEnvVarCollectionDescription = l10n.t(
         'Disables `python.terminal.shellIntegration.enabled` by unsetting `PYTHONSTARTUP` and `PYTHON_BASIC_REPL`',

src/client/common/utils/localize.ts

@@ -22,8 +22,6 @@ 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');
         context.environmentVariableCollection.description = new MarkdownString(
             Interpreters.shellIntegrationEnvVarCollectionDescription,
         );

src/client/terminals/pythonStartup.ts

@@ -135,15 +135,25 @@ suite('Terminal - Shell Integration with PYTHONSTARTUP', () => {
         globalEnvironmentVariableCollection.verify((c) => c.delete('PYTHONSTARTUP'), TypeMoq.Times.once());
     });
 
-    test('PYTHON_BASIC_REPL is set when shell integration is enabled', async () => {
+    test('PYTHON_BASIC_REPL is not set when shell integration is enabled', async () => {
         pythonConfig.setup((p) => p.get('terminal.shellIntegration.enabled')).returns(() => true);
+
         await registerPythonStartup(context.object);
+
         globalEnvironmentVariableCollection.verify(
-            (c) => c.replace('PYTHON_BASIC_REPL', '1', TypeMoq.It.isAny()),
-            TypeMoq.Times.once(),
+            (c) => c.replace('PYTHON_BASIC_REPL', TypeMoq.It.isAny(), TypeMoq.It.isAny()),
+            TypeMoq.Times.never(),
         );
     });
 
+    test('PYTHON_BASIC_REPL is deleted when shell integration is disabled', async () => {
+        pythonConfig.setup((p) => p.get('terminal.shellIntegration.enabled')).returns(() => false);
+
+        await registerPythonStartup(context.object);
+
+        globalEnvironmentVariableCollection.verify((c) => c.delete('PYTHON_BASIC_REPL'), TypeMoq.Times.once());
+    });
+
     test('Ensure registering terminal link calls registerTerminalLinkProvider', async () => {
         const registerTerminalLinkProviderStub = sinon.stub(
             pythonStartupLinkProvider,