console.log switch

Author: eleanorjboyd

src/client/terminals/codeExecution/codeExecutionManager.ts

@@ -40,15 +40,18 @@ export class CodeExecutionManager implements ICodeExecutionManager {
             (cmd) => {
                 this.disposableRegistry.push(
                     this.commandManager.registerCommand(cmd as any, async (file: Resource) => {
+                        console.log(`[EXEC] Command ${cmd} triggered with file: ${file?.fsPath}`);
                         traceVerbose(`Attempting to run Python file`, file?.fsPath);
                         const trigger = cmd === Commands.Exec_In_Terminal ? 'command' : 'icon';
                         const newTerminalPerFile = cmd === Commands.Exec_In_Separate_Terminal;
 
                         if (useEnvExtension()) {
+                            console.log('[EXEC] Using Environment Extension to execute file in terminal');
                             traceVerbose('Using Environment Extension to execute file in terminal');
                             try {
                                 await this.executeUsingExtension(file, cmd === Commands.Exec_In_Separate_Terminal);
                             } catch (ex) {
+                                console.error('[EXEC] Failed to execute file in terminal', ex);
                                 traceError('Failed to execute file in terminal', ex);
                             }
                             sendTelemetryEvent(EventName.ENVIRONMENT_CHECK_TRIGGER, undefined, {
@@ -125,53 +128,72 @@ export class CodeExecutionManager implements ICodeExecutionManager {
     }
 
     private async executeUsingExtension(file: Resource, dedicated: boolean): Promise<void> {
+        console.log(`[EXEC] executeUsingExtension called with file: ${file?.fsPath}, dedicated: ${dedicated}`);
         traceVerbose(`executeUsingExtension called with file: ${file?.fsPath}, dedicated: ${dedicated}`);
         const codeExecutionHelper = this.serviceContainer.get<ICodeExecutionHelper>(ICodeExecutionHelper);
         file = file instanceof Uri ? file : undefined;
         let fileToExecute = file ? file : await codeExecutionHelper.getFileToExecute();
         if (!fileToExecute) {
+            console.log('[EXEC] executeUsingExtension: No file to execute, returning early');
             traceVerbose('executeUsingExtension: No file to execute, returning early');
             return;
         }
+        console.log(`[EXEC] executeUsingExtension: File to execute: ${fileToExecute.fsPath}`);
         traceVerbose(`executeUsingExtension: File to execute: ${fileToExecute.fsPath}`);
 
         const fileAfterSave = await codeExecutionHelper.saveFileIfDirty(fileToExecute);
         if (fileAfterSave) {
+            console.log(`[EXEC] executeUsingExtension: File saved, updated path: ${fileAfterSave.fsPath}`);
             traceVerbose(`executeUsingExtension: File saved, updated path: ${fileAfterSave.fsPath}`);
             fileToExecute = fileAfterSave;
         }
 
         // Check on setting terminal.executeInFileDir
         const pythonSettings = this.configSettings.getSettings(file);
         let cwd = pythonSettings.terminal.executeInFileDir ? path.dirname(fileToExecute.fsPath) : undefined;
+        console.log(
+            `[EXEC] executeUsingExtension: CWD: ${cwd}, executeInFileDir: ${pythonSettings.terminal.executeInFileDir}`,
+        );
         traceVerbose(
             `executeUsingExtension: CWD: ${cwd}, executeInFileDir: ${pythonSettings.terminal.executeInFileDir}`,
         );
 
         // Check on setting terminal.launchArgs
         const launchArgs = pythonSettings.terminal.launchArgs;
         const totalArgs = [...launchArgs, fileToExecute.fsPath.fileToCommandArgumentForPythonExt()];
+        console.log(
+            `[EXEC] executeUsingExtension: Launch args: ${JSON.stringify(launchArgs)}, Total args: ${JSON.stringify(
+                totalArgs,
+            )}`,
+        );
         traceVerbose(
             `executeUsingExtension: Launch args: ${JSON.stringify(launchArgs)}, Total args: ${JSON.stringify(
                 totalArgs,
             )}`,
         );
 
         const show = this.shouldTerminalFocusOnStart(fileToExecute);
+        console.log(
+            `[EXEC] executeUsingExtension: Terminal focus on start: ${show}, Using dedicated terminal: ${dedicated}`,
+        );
         traceVerbose(`executeUsingExtension: Terminal focus on start: ${show}, Using dedicated terminal: ${dedicated}`);
         let terminal: Terminal | undefined;
         if (dedicated) {
+            console.log('[EXEC] executeUsingExtension: Calling runInDedicatedTerminal');
             traceVerbose('executeUsingExtension: Calling runInDedicatedTerminal');
             terminal = await runInDedicatedTerminal(fileToExecute, totalArgs, cwd, show);
         } else {
+            console.log('[EXEC] executeUsingExtension: Calling runInTerminal');
             traceVerbose('executeUsingExtension: Calling runInTerminal');
             terminal = await runInTerminal(fileToExecute, totalArgs, cwd, show);
         }
 
         if (terminal) {
+            console.log(`[EXEC] executeUsingExtension: Terminal created successfully, showing terminal`);
             traceVerbose(`executeUsingExtension: Terminal created successfully, showing terminal`);
             terminal.show();
         } else {
+            console.log('[EXEC] executeUsingExtension: No terminal returned from run function');
             traceVerbose('executeUsingExtension: No terminal returned from run function');
         }
     }