Merge branch 'anthonykim1/betterEnsureTerminalLog' of github.com:microsoft/vscode-python into anthonykim1/betterEnsureTerminalLog

Author: anthonykim1

src/client/common/terminal/service.ts

@@ -20,8 +20,6 @@ import {
     TerminalShellType,
 } from './types';
 import { traceVerbose } from '../../logging';
-import { useEnvExtension } from '../../envExt/api.internal';
-import { ensureTerminalLegacy } from '../../envExt/api.legacy';
 import { sleep } from '../utils/async';
 
 @injectable()
@@ -135,6 +133,7 @@ export class TerminalService implements ITerminalService, Disposable {
         }
     }
     // TODO: Debt switch to Promise<Terminal> ---> breaks 20 tests
+    // TODO: Properly migrate all creation, ensureTerminal to environment extension.
     public async ensureTerminal(preserveFocus: boolean = true): Promise<void> {
         if (this.terminal) {
             return;
@@ -154,15 +153,14 @@ export class TerminalService implements ITerminalService, Disposable {
             });
             this.terminalAutoActivator.disableAutoActivation(this.terminal);
 
-            await sleep(100);
+        await sleep(100);
 
-            await this.terminalActivator.activateEnvironmentInTerminal(this.terminal, {
-                resource: this.options?.resource,
-                preserveFocus,
-                interpreter: this.options?.interpreter,
-                hideFromUser: this.options?.hideFromUser,
-            });
-        }
+        await this.terminalActivator.activateEnvironmentInTerminal(this.terminal, {
+            resource: this.options?.resource,
+            preserveFocus,
+            interpreter: this.options?.interpreter,
+            hideFromUser: this.options?.hideFromUser,
+        });
 
         if (!this.options?.hideFromUser) {
             this.terminal.show(preserveFocus);

src/client/envExt/api.legacy.ts

@@ -148,5 +148,24 @@ export async function ensureTerminalLegacy(
         const terminal = await api.createTerminal(pythonEnv, fixedOptions);
         return terminal;
     }
+    traceError('ensureTerminalLegacy - Did not return terminal successfully.');
+    traceError(
+        'ensureTerminalLegacy - pythonEnv:',
+        pythonEnv
+            ? `id=${pythonEnv.envId.id}, managerId=${pythonEnv.envId.managerId}, name=${pythonEnv.name}, version=${pythonEnv.version}, executable=${pythonEnv.execInfo.run.executable}`
+            : 'undefined',
+    );
+    traceError(
+        'ensureTerminalLegacy - project:',
+        project ? `name=${project.name}, uri=${project.uri.toString()}` : 'undefined',
+    );
+    traceError(
+        'ensureTerminalLegacy - options:',
+        options
+            ? `name=${options.name}, cwd=${options.cwd?.toString()}, hideFromUser=${options.hideFromUser}`
+            : 'undefined',
+    );
+    traceError('ensureTerminalLegacy - resource:', resource?.toString() || 'undefined');
+
     throw new Error('Invalid arguments to create terminal');
 }