Skip to content

Commit 7aa0d38

Browse files
committed
onDidWriteTerminalData should live in window.apis.ts for extension
1 parent f196dd1 commit 7aa0d38

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

src/common/window.apis.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ export function onDidChangeTerminalShellIntegration(
4949
return window.onDidChangeTerminalShellIntegration(listener, thisArgs, disposables);
5050
}
5151

52+
export function onDidWriteTerminalData(
53+
listener: (e: { readonly terminal: Terminal; readonly data: string }) => any,
54+
thisArgs?: any,
55+
disposables?: Disposable[],
56+
): Disposable {
57+
return window.onDidWriteTerminalData(listener, thisArgs, disposables);
58+
}
59+
5260
export function showOpenDialog(options?: OpenDialogOptions): Thenable<Uri[] | undefined> {
5361
return window.showOpenDialog(options);
5462
}

src/features/terminal/utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as path from 'path';
2-
import { Disposable, Terminal, TerminalOptions, Uri, window } from 'vscode';
2+
import { Disposable, Terminal, TerminalOptions, Uri } from 'vscode';
33
import { PythonEnvironment, PythonProject, PythonProjectEnvironmentApi, PythonProjectGetterApi } from '../../api';
4-
import { onDidChangeTerminalShellIntegration } from '../../common/window.apis';
4+
import { onDidChangeTerminalShellIntegration, onDidWriteTerminalData } from '../../common/window.apis';
55
import { getConfiguration, getWorkspaceFolders } from '../../common/workspace.apis';
66

77
export const SHELL_INTEGRATION_TIMEOUT = 500; // 0.5 seconds
@@ -46,7 +46,7 @@ export async function waitForShellIntegration(terminal: Terminal): Promise<boole
4646
new Promise<boolean>((resolve) => {
4747
let dataSoFar = '';
4848
disposables.push(
49-
window.onDidWriteTerminalData((e) => {
49+
onDidWriteTerminalData((e) => {
5050
if (e.terminal === terminal) {
5151
dataSoFar += e.data;
5252
const lines = dataSoFar.split(/\r?\n/);

0 commit comments

Comments
 (0)