Skip to content

Commit 5ba1691

Browse files
committed
fix async return for runInDedicatedTerminal API
1 parent 11bb928 commit 5ba1691

1 file changed

Lines changed: 30 additions & 30 deletions

File tree

src/features/pythonApi.ts

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
1-
import { Uri, Disposable, Event, EventEmitter, Terminal, TaskExecution } from 'vscode';
1+
import { Disposable, Event, EventEmitter, TaskExecution, Terminal, Uri } from 'vscode';
22
import {
3-
PythonEnvironmentApi,
4-
PythonEnvironment,
5-
EnvironmentManager,
6-
PackageManager,
3+
CreateEnvironmentOptions,
4+
CreateEnvironmentScope,
75
DidChangeEnvironmentEventArgs,
86
DidChangeEnvironmentsEventArgs,
7+
DidChangeEnvironmentVariablesEventArgs,
8+
DidChangePackagesEventArgs,
99
DidChangePythonProjectsEventArgs,
10+
EnvironmentManager,
11+
GetEnvironmentScope,
1012
GetEnvironmentsScope,
1113
Package,
12-
PythonEnvironmentInfo,
13-
PythonProject,
14-
RefreshEnvironmentsScope,
15-
DidChangePackagesEventArgs,
16-
PythonEnvironmentId,
17-
CreateEnvironmentScope,
18-
SetEnvironmentScope,
19-
GetEnvironmentScope,
20-
PackageInfo,
2114
PackageId,
22-
PythonProjectCreator,
23-
ResolveEnvironmentContext,
15+
PackageInfo,
2416
PackageManagementOptions,
17+
PackageManager,
18+
PythonBackgroundRunOptions,
19+
PythonEnvironment,
20+
PythonEnvironmentApi,
21+
PythonEnvironmentId,
22+
PythonEnvironmentInfo,
2523
PythonProcess,
24+
PythonProject,
25+
PythonProjectCreator,
2626
PythonTaskExecutionOptions,
27-
PythonTerminalExecutionOptions,
28-
PythonBackgroundRunOptions,
2927
PythonTerminalCreateOptions,
30-
DidChangeEnvironmentVariablesEventArgs,
31-
CreateEnvironmentOptions,
28+
PythonTerminalExecutionOptions,
29+
RefreshEnvironmentsScope,
30+
ResolveEnvironmentContext,
31+
SetEnvironmentScope,
3232
} from '../api';
33+
import { traceInfo } from '../common/logging';
34+
import { pickEnvironmentManager } from '../common/pickers/managers';
35+
import { createDeferred } from '../common/utils/deferred';
36+
import { checkUri } from '../common/utils/pathUtils';
37+
import { handlePythonPath } from '../common/utils/pythonPath';
3338
import {
3439
EnvironmentManagers,
3540
InternalEnvironmentManager,
@@ -38,17 +43,12 @@ import {
3843
PythonPackageImpl,
3944
PythonProjectManager,
4045
} from '../internal.api';
41-
import { createDeferred } from '../common/utils/deferred';
42-
import { traceInfo } from '../common/logging';
43-
import { pickEnvironmentManager } from '../common/pickers/managers';
44-
import { handlePythonPath } from '../common/utils/pythonPath';
45-
import { TerminalManager } from './terminal/terminalManager';
46+
import { waitForAllEnvManagers, waitForEnvManager, waitForEnvManagerId } from './common/managerReady';
47+
import { EnvVarManager } from './execution/envVariableManager';
4648
import { runAsTask } from './execution/runAsTask';
47-
import { runInTerminal } from './terminal/runInTerminal';
4849
import { runInBackground } from './execution/runInBackground';
49-
import { EnvVarManager } from './execution/envVariableManager';
50-
import { checkUri } from '../common/utils/pathUtils';
51-
import { waitForAllEnvManagers, waitForEnvManager, waitForEnvManagerId } from './common/managerReady';
50+
import { runInTerminal } from './terminal/runInTerminal';
51+
import { TerminalManager } from './terminal/terminalManager';
5252

5353
class PythonEnvironmentApiImpl implements PythonEnvironmentApi {
5454
private readonly _onDidChangeEnvironments = new EventEmitter<DidChangeEnvironmentsEventArgs>();
@@ -318,7 +318,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi {
318318
environment,
319319
);
320320
await runInTerminal(environment, terminal, options);
321-
return terminal;
321+
return Promise.resolve(terminal);
322322
}
323323
runAsTask(environment: PythonEnvironment, options: PythonTaskExecutionOptions): Promise<TaskExecution> {
324324
return runAsTask(environment, options);

0 commit comments

Comments
 (0)