Merge branch 'main' into dynamic-impala

Author: eleanorjboyd

package-lock.json

@@ -1713,7 +1713,7 @@
         "semver": "^7.5.2",
         "stack-trace": "0.0.10",
         "sudo-prompt": "^9.2.1",
-        "tmp": "^0.0.33",
+        "tmp": "^0.2.5",
         "uint64be": "^3.0.0",
         "unicode": "^14.0.0",
         "vscode-debugprotocol": "^1.28.0",

package.json

@@ -5,14 +5,7 @@ import * as tmp from 'tmp';
 import { ITempFileSystem, TemporaryFile } from './types';
 
 interface IRawTempFS {
-    // TODO (https://github.com/microsoft/vscode/issues/84517)
-    //   This functionality has been requested for the
-    //   VS Code FS API (vscode.workspace.fs.*).
-    file(
-        config: tmp.Options,
-
-        callback?: (err: any, path: string, fd: number, cleanupCallback: () => void) => void,
-    ): void;
+    fileSync(config?: tmp.Options): tmp.SynchrounousResult;
 }
 
 // Operations related to temporary files and directories.
@@ -35,14 +28,13 @@ export class TemporaryFileSystem implements ITempFileSystem {
             mode,
         };
         return new Promise<TemporaryFile>((resolve, reject) => {
-            this.raw.file(opts, (err, filename, _fd, cleanUp) => {
-                if (err) {
-                    return reject(err);
-                }
-                resolve({
-                    filePath: filename,
-                    dispose: cleanUp,
-                });
+            const { name, removeCallback } = this.raw.fileSync(opts);
+            if (!name) {
+                return reject(new Error('Failed to create temp file'));
+            }
+            resolve({
+                filePath: name,
+                dispose: removeCallback,
             });
         });
     }

src/client/common/platform/fs-temp.ts

@@ -5,7 +5,7 @@
 
 import { inject, injectable } from 'inversify';
 import { Disposable, EventEmitter, Terminal, Uri } from 'vscode';
-
+import * as path from 'path';
 import { ICommandManager, IDocumentManager } from '../../common/application/types';
 import { Commands } from '../../common/constants';
 import '../../common/extensions';
@@ -130,6 +130,15 @@ export class CodeExecutionManager implements ICodeExecutionManager {
         if (!fileToExecute) {
             return;
         }
+
+        // Check on setting terminal.executeInFileDir
+        const pythonSettings = this.configSettings.getSettings(file);
+        let cwd = pythonSettings.terminal.executeInFileDir ? path.dirname(fileToExecute.fsPath) : undefined;
+
+        // Check on setting terminal.launchArgs
+        const launchArgs = pythonSettings.terminal.launchArgs;
+        const totalArgs = [...launchArgs, fileToExecute.fsPath.fileToCommandArgumentForPythonExt()];
+
         const fileAfterSave = await codeExecutionHelper.saveFileIfDirty(fileToExecute);
         if (fileAfterSave) {
             fileToExecute = fileAfterSave;
@@ -138,19 +147,9 @@ export class CodeExecutionManager implements ICodeExecutionManager {
         const show = this.shouldTerminalFocusOnStart(fileToExecute);
         let terminal: Terminal | undefined;
         if (dedicated) {
-            terminal = await runInDedicatedTerminal(
-                fileToExecute,
-                [fileToExecute.fsPath.fileToCommandArgumentForPythonExt()],
-                undefined,
-                show,
-            );
+            terminal = await runInDedicatedTerminal(fileToExecute, totalArgs, cwd, show);
         } else {
-            terminal = await runInTerminal(
-                fileToExecute,
-                [fileToExecute.fsPath.fileToCommandArgumentForPythonExt()],
-                undefined,
-                show,
-            );
+            terminal = await runInTerminal(fileToExecute, totalArgs, cwd, show);
         }
 
         if (terminal) {

src/client/terminals/codeExecution/codeExecutionManager.ts

@@ -7,11 +7,14 @@ import { TemporaryFileSystem } from '../../../client/common/platform/fs-temp';
 
 interface IDeps {
     // tmp module
-    file(
-        config: { postfix?: string; mode?: number },
-
-        callback?: (err: any, path: string, fd: number, cleanupCallback: () => void) => void,
-    ): void;
+    fileSync(config: {
+        postfix?: string;
+        mode?: number;
+    }): {
+        name: string;
+        fd: number;
+        removeCallback(): void;
+    };
 }
 
 suite('FileSystem - temp files', () => {
@@ -28,7 +31,7 @@ suite('FileSystem - temp files', () => {
     suite('createFile', () => {
         test(`fails if the raw call fails`, async () => {
             const failure = new Error('oops');
-            deps.setup((d) => d.file({ postfix: '.tmp', mode: undefined }, TypeMoq.It.isAny()))
+            deps.setup((d) => d.fileSync({ postfix: '.tmp', mode: undefined }))
                 // fail with an arbitrary error
                 .throws(failure);
 
@@ -40,7 +43,7 @@ suite('FileSystem - temp files', () => {
 
         test(`fails if the raw call "returns" an error`, async () => {
             const failure = new Error('oops');
-            deps.setup((d) => d.file({ postfix: '.tmp', mode: undefined }, TypeMoq.It.isAny())).callback((_cfg, cb) =>
+            deps.setup((d) => d.fileSync({ postfix: '.tmp', mode: undefined })).callback((_cfg, cb) =>
                 cb(failure, '...', -1, () => {}),
             );