Skip to content

bug: use executeInFileDir and launchArgs settings with envs ext #25405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2025
Merged

bug: use executeInFileDir and launchArgs settings with envs ext #25405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1daa410
bug: use executeInFileDir and launchArgs settings with envs ext
eleanorjboyd Aug 20, 2025
2166cfe
Merge branch 'main' into increasing-starfish
eleanorjboyd Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions src/client/terminals/codeExecution/codeExecutionManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
Loading