Skip to content

Commit 94badeb

Browse files
committed
add resolution attempt
1 parent 3d362a3 commit 94badeb

1 file changed

Lines changed: 14 additions & 5 deletions

File tree

src/features/envCommands.ts

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -574,8 +574,10 @@ export async function runInTerminalCommand(
574574
const project = api.getPythonProject(uri);
575575
const environment = await api.getEnvironment(uri);
576576
if (environment && project) {
577-
const terminal = await tm.getProjectTerminal(project, environment);
578-
await runInTerminal(environment, terminal, {
577+
const resolvedEnv = await api.resolveEnvironment(environment.environmentPath);
578+
const envFinal = resolvedEnv ?? environment;
579+
const terminal = await tm.getProjectTerminal(project, envFinal);
580+
await runInTerminal(envFinal, terminal, {
579581
cwd: project.uri,
580582
args: [item.fsPath],
581583
show: true,
@@ -594,9 +596,13 @@ export async function runInDedicatedTerminalCommand(
594596
const uri = item as Uri;
595597
const project = api.getPythonProject(uri);
596598
const environment = await api.getEnvironment(uri);
599+
600+
// add resolution here
597601
if (environment && project) {
598-
const terminal = await tm.getDedicatedTerminal(item, project, environment);
599-
await runInTerminal(environment, terminal, {
602+
const resolvedEnv = await api.resolveEnvironment(environment.environmentPath);
603+
const envFinal = resolvedEnv ?? environment;
604+
const terminal = await tm.getDedicatedTerminal(item, project, envFinal);
605+
await runInTerminal(envFinal, terminal, {
600606
cwd: project.uri,
601607
args: [item.fsPath],
602608
show: true,
@@ -612,8 +618,10 @@ export async function runAsTaskCommand(item: unknown, api: PythonEnvironmentApi)
612618
const project = api.getPythonProject(uri);
613619
const environment = await api.getEnvironment(uri);
614620
if (environment) {
621+
const resolvedEnv = await api.resolveEnvironment(environment.environmentPath);
622+
const envFinal = resolvedEnv ?? environment;
615623
return await runAsTask(
616-
environment,
624+
envFinal,
617625
{
618626
project,
619627
args: [item.fsPath],
@@ -624,6 +632,7 @@ export async function runAsTaskCommand(item: unknown, api: PythonEnvironmentApi)
624632
);
625633
}
626634
} else if (item === undefined) {
635+
// If no context is provided, try to use the active text editor
627636
const uri = activeTextEditor()?.document.uri;
628637
if (uri) {
629638
return runAsTaskCommand(uri, api);

0 commit comments

Comments
 (0)