Ensure Run Python in dedicated terminal uses `python.executeInFirDi…

…r` setting (#21681)
microsoft · Jul 24, 2023 · 9bcb82d · 9bcb82d
1 parent 713007f
commit 9bcb82d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/client/pythonEnvironments/base/locators/lowLevel/windowsKnownPathsLocator.ts b/src/client/pythonEnvironments/base/locators/lowLevel/windowsKnownPathsLocator.ts
@@ -94,8 +94,10 @@ function getDirFilesLocator(
     // take a naive approach.
     async function* iterEnvs(query: PythonLocatorQuery): IPythonEnvsIterator<BasicEnvInfo> {
         traceVerbose('Searching for windows path interpreters');
-        yield* await getEnvs(locator.iterEnvs(query));
-        traceVerbose('Finished searching for windows path interpreters');
+        yield* await getEnvs(locator.iterEnvs(query)).then((res) => {
+            traceVerbose('Finished searching for windows path interpreters');
+            return res;
+        });
     }
     return {
         providerId: locator.providerId,

diff --git a/src/client/terminals/codeExecution/terminalCodeExecution.ts b/src/client/terminals/codeExecution/terminalCodeExecution.ts
@@ -30,7 +30,7 @@ export class TerminalCodeExecutionProvider implements ICodeExecutionService {
     ) {}
 
     public async executeFile(file: Uri, options?: { newTerminalPerFile: boolean }) {
-        await this.setCwdForFileExecution(file);
+        await this.setCwdForFileExecution(file, options);
         const { command, args } = await this.getExecuteFileArgs(file, [
             file.fsPath.fileToCommandArgumentForPythonExt(),
         ]);
@@ -88,7 +88,7 @@ export class TerminalCodeExecutionProvider implements ICodeExecutionService {
             newTerminalPerFile: options?.newTerminalPerFile,
         });
     }
-    private async setCwdForFileExecution(file: Uri) {
+    private async setCwdForFileExecution(file: Uri, options?: { newTerminalPerFile: boolean }) {
         const pythonSettings = this.configurationService.getSettings(file);
         if (!pythonSettings.terminal.executeInFileDir) {
             return;
@@ -106,7 +106,9 @@ export class TerminalCodeExecutionProvider implements ICodeExecutionService {
                     await this.getTerminalService(file).sendText(`${fileDrive}:`);
                 }
             }
-            await this.getTerminalService(file).sendText(`cd ${fileDirPath.fileToCommandArgumentForPythonExt()}`);
+            await this.getTerminalService(file, options).sendText(
+                `cd ${fileDirPath.fileToCommandArgumentForPythonExt()}`,
+            );
         }
     }
 }