Merge branch 'main' into feature/implement_copy_import_path

Author: s-kai273

package.json

@@ -325,7 +325,8 @@
             {
                 "category": "Python",
                 "command": "python.execSelectionInTerminal",
-                "title": "%python.command.python.execSelectionInTerminal.title%"
+                "title": "%python.command.python.execSelectionInTerminal.title%",
+                "shortTitle": "%python.command.python.execSelectionInTerminal.shortTitle%"
             },
             {
                 "category": "Python",

package.nls.json

@@ -6,7 +6,7 @@
     "python.command.python.createTerminal.title": "Create Terminal",
     "python.command.python.execInTerminal.title": "Run Python File in Terminal",
     "python.command.python.execInTerminalIcon.title": "Run Python File",
-    "python.command.python.execInDedicatedTerminal.title": "Run Python File in Dedicated Terminal",
+    "python.command.python.execInDedicatedTerminal.title": "Run Python File in Dedicated Terminal", 
     "python.command.python.setInterpreter.title": "Select Interpreter",
     "python.command.python.clearWorkspaceInterpreter.title": "Clear Workspace Interpreter Setting",
     "python.command.python.viewOutput.title": "Show Output",
@@ -15,6 +15,7 @@
     "python.command.python.configureTests.title": "Configure Tests",
     "python.command.testing.rerunFailedTests.title": "Rerun Failed Tests",
     "python.command.python.execSelectionInTerminal.title": "Run Selection/Line in Python Terminal",
+    "python.command.python.execSelectionInTerminal.shortTitle": "Run Selection/Line",
     "python.command.python.execInREPL.title": "Run Selection/Line in Native Python REPL",
     "python.command.python.execSelectionInDjangoShell.title": "Run Selection/Line in Django Shell",
     "python.command.python.reportIssue.title": "Report Issue...",

src/client/terminals/envCollectionActivation/service.ts

@@ -44,6 +44,7 @@ import {
 } from '../types';
 import { ProgressService } from '../../common/application/progressService';
 import { useEnvExtension } from '../../envExt/api.internal';
+import { registerPythonStartup } from '../pythonStartup';
 
 @injectable()
 export class TerminalEnvVarCollectionService implements IExtensionActivationService, ITerminalEnvVarCollectionService {
@@ -109,6 +110,7 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
                     );
                     this.registeredOnce = true;
                 }
+                await registerPythonStartup(this.context);
                 return;
             }
             if (!this.registeredOnce) {

src/test/interpreters/activation/terminalEnvVarCollectionService.unit.test.ts

@@ -6,12 +6,14 @@
 import * as sinon from 'sinon';
 import { assert, expect } from 'chai';
 import { mock, instance, when, anything, verify, reset } from 'ts-mockito';
+import * as TypeMoq from 'typemoq';
 import {
     EnvironmentVariableCollection,
     EnvironmentVariableMutatorOptions,
     GlobalEnvironmentVariableCollection,
     ProgressLocation,
     Uri,
+    WorkspaceConfiguration,
     WorkspaceFolder,
 } from 'vscode';
 import {
@@ -55,6 +57,7 @@ suite('Terminal Environment Variable Collection Service', () => {
     let terminalEnvVarCollectionService: TerminalEnvVarCollectionService;
     let terminalDeactivateService: ITerminalDeactivateService;
     let useEnvExtensionStub: sinon.SinonStub;
+    let pythonConfig: TypeMoq.IMock<WorkspaceConfiguration>;
     const progressOptions = {
         location: ProgressLocation.Window,
         title: Interpreters.activatingTerminals,
@@ -122,6 +125,8 @@ suite('Terminal Environment Variable Collection Service', () => {
             instance(shellIntegrationService),
             instance(envVarProvider),
         );
+        pythonConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
+        pythonConfig.setup((p) => p.get('terminal.shellIntegration.enabled')).returns(() => false);
     });
 
     teardown(() => {