Skip to content

Commit 0073b24

Browse files
TyriarTyriar
authored
Merge pull request microsoft#184543 from microsoft/tyriar/windowsPty
Update xterm and adopt windowsPty
2 parents 24c43ef + b28ef2d commit 0073b24

File tree

19 files changed

+129
-109
lines changed

19 files changed

+129
-109
lines changed

‎package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@
8989
"vscode-oniguruma": "1.7.0",
9090
"vscode-regexpp": "^3.1.0",
9191
"vscode-textmate": "9.0.0",
92-
"xterm": "5.2.0-beta.49",
93-
"xterm-addon-canvas": "0.4.0-beta.14",
92+
"xterm": "5.2.0-beta.53",
93+
"xterm-addon-canvas": "0.4.0-beta.15",
9494
"xterm-addon-image": "0.4.0",
95-
"xterm-addon-search": "0.12.0-beta.5",
96-
"xterm-addon-serialize": "0.10.0-beta.2",
95+
"xterm-addon-search": "0.12.0-beta.6",
96+
"xterm-addon-serialize": "0.10.0-beta.3",
9797
"xterm-addon-unicode11": "0.5.0",
98-
"xterm-addon-webgl": "0.15.0-beta.15",
99-
"xterm-headless": "5.2.0-beta.49",
98+
"xterm-addon-webgl": "0.15.0-beta.16",
99+
"xterm-headless": "5.2.0-beta.53",
100100
"yauzl": "^2.9.2",
101101
"yazl": "^2.4.3"
102102
},

‎remote/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
"vscode-oniguruma": "1.7.0",
2525
"vscode-regexpp": "^3.1.0",
2626
"vscode-textmate": "9.0.0",
27-
"xterm": "5.2.0-beta.49",
28-
"xterm-addon-canvas": "0.4.0-beta.14",
27+
"xterm": "5.2.0-beta.53",
28+
"xterm-addon-canvas": "0.4.0-beta.15",
2929
"xterm-addon-image": "0.4.0",
30-
"xterm-addon-search": "0.12.0-beta.5",
31-
"xterm-addon-serialize": "0.10.0-beta.2",
30+
"xterm-addon-search": "0.12.0-beta.6",
31+
"xterm-addon-serialize": "0.10.0-beta.3",
3232
"xterm-addon-unicode11": "0.5.0",
33-
"xterm-addon-webgl": "0.15.0-beta.15",
34-
"xterm-headless": "5.2.0-beta.49",
33+
"xterm-addon-webgl": "0.15.0-beta.16",
34+
"xterm-headless": "5.2.0-beta.53",
3535
"yauzl": "^2.9.2",
3636
"yazl": "^2.4.3"
3737
},

‎remote/web/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"tas-client-umd": "0.1.8",
1212
"vscode-oniguruma": "1.7.0",
1313
"vscode-textmate": "9.0.0",
14-
"xterm": "5.2.0-beta.49",
15-
"xterm-addon-canvas": "0.4.0-beta.14",
14+
"xterm": "5.2.0-beta.53",
15+
"xterm-addon-canvas": "0.4.0-beta.15",
1616
"xterm-addon-image": "0.4.0",
17-
"xterm-addon-search": "0.12.0-beta.5",
17+
"xterm-addon-search": "0.12.0-beta.6",
1818
"xterm-addon-unicode11": "0.5.0",
19-
"xterm-addon-webgl": "0.15.0-beta.15"
19+
"xterm-addon-webgl": "0.15.0-beta.16"
2020
}
2121
}

‎remote/web/yarn.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,32 +68,32 @@ [email protected]:
6868
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c"
6969
integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg==
7070

71-
[email protected].14:
72-
version "0.4.0-beta.14"
73-
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.4.0-beta.14.tgz#ed8b5d2a839608ae5c9c73d1fa11f6ffb5f92be7"
74-
integrity sha512-FBlHGuSjQMuujwOBhuoOO16iLHgeQ9ucOApsTS+Hf0ZpOnFVQX3JQDYAWlxRIpfDa/HiEGYPhAgFjqqFMtXL4Q==
71+
[email protected].15:
72+
version "0.4.0-beta.15"
73+
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.4.0-beta.15.tgz#8e181ec587c9b339619d363f80becb8db48435e3"
74+
integrity sha512-fNwkh5locfVgXn+t9tmtKYaGJaemykPc3fu+RVhrbMrAJTYIM0rIXLypB8VKgeDGhkiOwXQaf7xwU2LpcCIZNw==
7575

7676
[email protected]:
7777
version "0.4.0"
7878
resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.4.0.tgz#36e98fa892db11755a5f6e9654f924e876e29bf8"
7979
integrity sha512-3wumCJo4WTzxvecSMxJ7XtpVQeFe4gE2cdHCyUdo7zagVkS18YXJacGx6DjlAIccdJn6/LhGuD99xOSSvYx9Gw==
8080

81-
[email protected].5:
82-
version "0.12.0-beta.5"
83-
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.12.0-beta.5.tgz#36bae02306a54837b86beebbf4ac1b9b19a0d567"
84-
integrity sha512-ci3SMkjyGR+C9bRaeQerLY8WneJY6oeI/YLkM80ZgH4C3ViuD2foZav2AbcW5I7uwaHz3CFjlKAY6Nf00TRG8g==
81+
[email protected].6:
82+
version "0.12.0-beta.6"
83+
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.12.0-beta.6.tgz#1c9afb69cca586a94e8965712387ee210ccd8d64"
84+
integrity sha512-DJSDhdm7zqgUBGs4oq/yBvBxTgos3DaBveBx8j+KYRPPeHmfLa8mex1rC5iYTxsk80uzVny5VQgMrpMgAfZQyg==
8585

8686
[email protected]:
8787
version "0.5.0"
8888
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0.tgz#41c0d96acc1e3bb6c6596eee64e163b6bca74be7"
8989
integrity sha512-Jm4/g4QiTxiKiTbYICQgC791ubhIZyoIwxAIgOW8z8HWFNY+lwk+dwaKEaEeGBfM48Vk8fklsUW9u/PlenYEBg==
9090

91-
[email protected].15:
92-
version "0.15.0-beta.15"
93-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.15.tgz#bc9422425c27ebd86059f6b2465f01c5ec07071a"
94-
integrity sha512-0zFn6Fsvo7jbSWO2TwNUHlAoceWWb2EYI/SgxN+H6+4kpUV1clP53pTQBdUpAtPEjJsVgxERqOPKBFu14TnR0w==
91+
[email protected].16:
92+
version "0.15.0-beta.16"
93+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.16.tgz#69ae1e3743737913007569e33ad58f4660fadddd"
94+
integrity sha512-T08dObBpZhOh8LtqG9nV94yY9x7ONhnHMggTDUXzJvZ3SfrzgoDSDMKF84KhZsCtZShhJyQxR6+RNWX1nJZ8eA==
9595

96-
[email protected].49:
97-
version "5.2.0-beta.49"
98-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.49.tgz#0c9c176862019800172fc016d136300d1b6531ce"
99-
integrity sha512-kfdiYljgAmjM9VpkNuuDcUJJHB62UiSTVZRYJbQdOU7jCi9mnUTPWov+5PnZIgONGts3t3Dv5kdbNF4UH53uTA==
96+
[email protected].53:
97+
version "5.2.0-beta.53"
98+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.53.tgz#4a9b618b675f5b6b860a7205c8ff0dfba0879ccd"
99+
integrity sha512-REM8Jhffs23MqzF3MxdeODB8cr3ewqULN9Tl9jJdKQOpXBnLXcUKAeGeRVuFyeZYSoXH7fJicX1EJcsW8rPvZw==

‎remote/yarn.lock

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -836,45 +836,45 @@ wrappy@1:
836836
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
837837
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
838838

839-
[email protected].14:
840-
version "0.4.0-beta.14"
841-
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.4.0-beta.14.tgz#ed8b5d2a839608ae5c9c73d1fa11f6ffb5f92be7"
842-
integrity sha512-FBlHGuSjQMuujwOBhuoOO16iLHgeQ9ucOApsTS+Hf0ZpOnFVQX3JQDYAWlxRIpfDa/HiEGYPhAgFjqqFMtXL4Q==
839+
[email protected].15:
840+
version "0.4.0-beta.15"
841+
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.4.0-beta.15.tgz#8e181ec587c9b339619d363f80becb8db48435e3"
842+
integrity sha512-fNwkh5locfVgXn+t9tmtKYaGJaemykPc3fu+RVhrbMrAJTYIM0rIXLypB8VKgeDGhkiOwXQaf7xwU2LpcCIZNw==
843843

844844
[email protected]:
845845
version "0.4.0"
846846
resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.4.0.tgz#36e98fa892db11755a5f6e9654f924e876e29bf8"
847847
integrity sha512-3wumCJo4WTzxvecSMxJ7XtpVQeFe4gE2cdHCyUdo7zagVkS18YXJacGx6DjlAIccdJn6/LhGuD99xOSSvYx9Gw==
848848

849-
[email protected].5:
850-
version "0.12.0-beta.5"
851-
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.12.0-beta.5.tgz#36bae02306a54837b86beebbf4ac1b9b19a0d567"
852-
integrity sha512-ci3SMkjyGR+C9bRaeQerLY8WneJY6oeI/YLkM80ZgH4C3ViuD2foZav2AbcW5I7uwaHz3CFjlKAY6Nf00TRG8g==
849+
[email protected].6:
850+
version "0.12.0-beta.6"
851+
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.12.0-beta.6.tgz#1c9afb69cca586a94e8965712387ee210ccd8d64"
852+
integrity sha512-DJSDhdm7zqgUBGs4oq/yBvBxTgos3DaBveBx8j+KYRPPeHmfLa8mex1rC5iYTxsk80uzVny5VQgMrpMgAfZQyg==
853853

854-
[email protected].2:
855-
version "0.10.0-beta.2"
856-
resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.10.0-beta.2.tgz#331a5f54ab1380e4d5fcde7f03ac28b138efa803"
857-
integrity sha512-cCUoWGTFcBT4kDNhUP/Lohl5hJStEtxprJErYdhvT8lorPhA+zai6Sv0sT3A5Je5nmG2rSrS9hPZUj6kmPjGvw==
854+
[email protected].3:
855+
version "0.10.0-beta.3"
856+
resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.10.0-beta.3.tgz#3fd186421a26c1ebcf448c699103f840d97db049"
857+
integrity sha512-nlnOS+5If/VOlekRh7rJmuO7bkpzyZd56p0JijQRp8KUrwPrlGFn0AEUcy8291d9L6A1RTCDU+E4YiRobAPoVA==
858858

859859
[email protected]:
860860
version "0.5.0"
861861
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0.tgz#41c0d96acc1e3bb6c6596eee64e163b6bca74be7"
862862
integrity sha512-Jm4/g4QiTxiKiTbYICQgC791ubhIZyoIwxAIgOW8z8HWFNY+lwk+dwaKEaEeGBfM48Vk8fklsUW9u/PlenYEBg==
863863

864-
[email protected].15:
865-
version "0.15.0-beta.15"
866-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.15.tgz#bc9422425c27ebd86059f6b2465f01c5ec07071a"
867-
integrity sha512-0zFn6Fsvo7jbSWO2TwNUHlAoceWWb2EYI/SgxN+H6+4kpUV1clP53pTQBdUpAtPEjJsVgxERqOPKBFu14TnR0w==
864+
[email protected].16:
865+
version "0.15.0-beta.16"
866+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.16.tgz#69ae1e3743737913007569e33ad58f4660fadddd"
867+
integrity sha512-T08dObBpZhOh8LtqG9nV94yY9x7ONhnHMggTDUXzJvZ3SfrzgoDSDMKF84KhZsCtZShhJyQxR6+RNWX1nJZ8eA==
868868

869-
[email protected].49:
870-
version "5.2.0-beta.49"
871-
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.2.0-beta.49.tgz#ac6e833fa025441503db27980f40ab4ae549a3f4"
872-
integrity sha512-jaNvl5f8Qx5xG1i79/7pzlAzUMC0Or8sPW7v/R7bw5MenMZPE5sE0pYNYW3xWB91voBPbGuXvrMdtraY8gL/Og==
869+
[email protected].53:
870+
version "5.2.0-beta.53"
871+
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.2.0-beta.53.tgz#30c7853c44476f5d388b43449de40362b9e25c21"
872+
integrity sha512-DvRoGp3gSZ3OkZaCOnIJCrXlSpN/Xghf/XacTKnuMTQQhBylD7CwxHmdqPuS3G1rVqnUnlJKAII7JcIZkW5BeQ==
873873

874-
[email protected].49:
875-
version "5.2.0-beta.49"
876-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.49.tgz#0c9c176862019800172fc016d136300d1b6531ce"
877-
integrity sha512-kfdiYljgAmjM9VpkNuuDcUJJHB62UiSTVZRYJbQdOU7jCi9mnUTPWov+5PnZIgONGts3t3Dv5kdbNF4UH53uTA==
874+
[email protected].53:
875+
version "5.2.0-beta.53"
876+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.53.tgz#4a9b618b675f5b6b860a7205c8ff0dfba0879ccd"
877+
integrity sha512-REM8Jhffs23MqzF3MxdeODB8cr3ewqULN9Tl9jJdKQOpXBnLXcUKAeGeRVuFyeZYSoXH7fJicX1EJcsW8rPvZw==
878878

879879
yallist@^4.0.0:
880880
version "4.0.0"

‎src/vs/platform/terminal/common/terminal.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,18 @@ export interface ITerminalLaunchError {
641641
export interface IProcessReadyEvent {
642642
pid: number;
643643
cwd: string;
644-
requiresWindowsMode?: boolean;
644+
windowsPty: IProcessReadyWindowsPty | undefined;
645+
}
646+
647+
export interface IProcessReadyWindowsPty {
648+
/**
649+
* What pty emulation backend is being used.
650+
*/
651+
backend: 'conpty' | 'winpty';
652+
/**
653+
* The Windows build version (eg. 19045)
654+
*/
655+
buildNumber: number;
645656
}
646657

647658
/**

‎src/vs/platform/terminal/node/ptyHostService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { RemoteLoggerChannelClient } from 'vs/platform/log/common/logIpc';
1313
import { getResolvedShellEnv } from 'vs/platform/shell/node/shellEnv';
1414
import { IPtyHostProcessReplayEvent } from 'vs/platform/terminal/common/capabilities/capabilities';
1515
import { RequestStore } from 'vs/platform/terminal/common/requestStore';
16-
import { HeartbeatConstants, IHeartbeatService, IProcessDataEvent, IProcessProperty, IProcessPropertyMap, IPtyService, IRequestResolveVariablesEvent, ISerializedTerminalState, IShellLaunchConfig, ITerminalLaunchError, ITerminalProcessOptions, ITerminalProfile, ITerminalsLayoutInfo, ProcessPropertyType, TerminalIcon, TerminalIpcChannels, TerminalSettingId, TitleEventSource } from 'vs/platform/terminal/common/terminal';
16+
import { HeartbeatConstants, IHeartbeatService, IProcessDataEvent, IProcessProperty, IProcessPropertyMap, IProcessReadyEvent, IPtyService, IRequestResolveVariablesEvent, ISerializedTerminalState, IShellLaunchConfig, ITerminalLaunchError, ITerminalProcessOptions, ITerminalProfile, ITerminalsLayoutInfo, ProcessPropertyType, TerminalIcon, TerminalIpcChannels, TerminalSettingId, TitleEventSource } from 'vs/platform/terminal/common/terminal';
1717
import { registerTerminalPlatformConfiguration } from 'vs/platform/terminal/common/terminalPlatformConfiguration';
1818
import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess';
1919
import { IPtyHostConnection, IPtyHostStarter } from 'vs/platform/terminal/node/ptyHost';
@@ -76,7 +76,7 @@ export class PtyHostService extends Disposable implements IPtyService {
7676

7777
private readonly _onProcessData = this._register(new Emitter<{ id: number; event: IProcessDataEvent | string }>());
7878
readonly onProcessData = this._onProcessData.event;
79-
private readonly _onProcessReady = this._register(new Emitter<{ id: number; event: { pid: number; cwd: string } }>());
79+
private readonly _onProcessReady = this._register(new Emitter<{ id: number; event: IProcessReadyEvent }>());
8080
readonly onProcessReady = this._onProcessReady.event;
8181
private readonly _onProcessReplay = this._register(new Emitter<{ id: number; event: IPtyHostProcessReplayEvent }>());
8282
readonly onProcessReplay = this._onProcessReplay.event;

‎src/vs/platform/terminal/node/ptyService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class PtyService extends Disposable implements IPtyService {
5252
readonly onProcessData = this._onProcessData.event;
5353
private readonly _onProcessReplay = this._register(new Emitter<{ id: number; event: IPtyHostProcessReplayEvent }>());
5454
readonly onProcessReplay = this._onProcessReplay.event;
55-
private readonly _onProcessReady = this._register(new Emitter<{ id: number; event: { pid: number; cwd: string } }>());
55+
private readonly _onProcessReady = this._register(new Emitter<{ id: number; event: IProcessReadyEvent }>());
5656
readonly onProcessReady = this._onProcessReady.event;
5757
private readonly _onProcessExit = this._register(new Emitter<{ id: number; event: number | undefined }>());
5858
readonly onProcessExit = this._onProcessExit.event;
@@ -720,7 +720,7 @@ class PersistentTerminalProcess extends Disposable {
720720
return result;
721721
}
722722

723-
this._onProcessReady.fire({ pid: this._pid, cwd: this._cwd, requiresWindowsMode: isWindows && getWindowsBuildNumber() < 21376 });
723+
this._onProcessReady.fire({ pid: this._pid, cwd: this._cwd, windowsPty: this._terminalProcess.getWindowsPty() });
724724
this._onDidChangeProperty.fire({ type: ProcessPropertyType.Title, value: this._terminalProcess.currentTitle });
725725
this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: this._terminalProcess.shellType });
726726
this.triggerReplay();

‎src/vs/platform/terminal/node/terminalProcess.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { Promises } from 'vs/base/node/pfs';
1515
import { localize } from 'vs/nls';
1616
import { ILogService } from 'vs/platform/log/common/log';
1717
import { IProductService } from 'vs/platform/product/common/productService';
18-
import { FlowControlConstants, IShellLaunchConfig, ITerminalChildProcess, ITerminalLaunchError, IProcessProperty, IProcessPropertyMap as IProcessPropertyMap, ProcessPropertyType, TerminalShellType, IProcessReadyEvent, ITerminalProcessOptions, PosixShellType } from 'vs/platform/terminal/common/terminal';
18+
import { FlowControlConstants, IShellLaunchConfig, ITerminalChildProcess, ITerminalLaunchError, IProcessProperty, IProcessPropertyMap as IProcessPropertyMap, ProcessPropertyType, TerminalShellType, IProcessReadyEvent, ITerminalProcessOptions, PosixShellType, IProcessReadyWindowsPty } from 'vs/platform/terminal/common/terminal';
1919
import { ChildProcessMonitor } from 'vs/platform/terminal/node/childProcessMonitor';
2020
import { findExecutable, getShellIntegrationInjection, getWindowsBuildNumber, IShellIntegrationConfigInjection } from 'vs/platform/terminal/node/terminalEnvironment';
2121
import { WindowsShellHelper } from 'vs/platform/terminal/node/windowsShellHelper';
@@ -398,7 +398,11 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
398398
}
399399

400400
private _sendProcessId(pid: number) {
401-
this._onProcessReady.fire({ pid, cwd: this._initialCwd, requiresWindowsMode: isWindows && getWindowsBuildNumber() < 21376 });
401+
this._onProcessReady.fire({
402+
pid,
403+
cwd: this._initialCwd,
404+
windowsPty: this.getWindowsPty()
405+
});
402406
}
403407

404408
private _sendProcessTitle(ptyProcess: IPty): void {
@@ -616,6 +620,13 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
616620
getLatency(): Promise<number> {
617621
return Promise.resolve(0);
618622
}
623+
624+
getWindowsPty(): IProcessReadyWindowsPty | undefined {
625+
return isWindows ? {
626+
backend: 'useConpty' in this._ptyOptions && this._ptyOptions.useConpty ? 'conpty' : 'winpty',
627+
buildNumber: getWindowsBuildNumber()
628+
} : undefined;
629+
}
619630
}
620631

621632
/**

‎src/vs/workbench/api/browser/mainThreadTerminalService.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { URI } from 'vs/base/common/uri';
1010
import { StopWatch } from 'vs/base/common/stopwatch';
1111
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1212
import { ILogService } from 'vs/platform/log/common/log';
13-
import { IProcessProperty, IShellLaunchConfig, IShellLaunchConfigDto, ITerminalOutputMatch, ITerminalOutputMatcher, ProcessPropertyType, TerminalExitReason, TerminalLocation } from 'vs/platform/terminal/common/terminal';
13+
import { IProcessProperty, IProcessReadyWindowsPty, IShellLaunchConfig, IShellLaunchConfigDto, ITerminalOutputMatch, ITerminalOutputMatcher, ProcessPropertyType, TerminalExitReason, TerminalLocation } from 'vs/platform/terminal/common/terminal';
1414
import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBuffering';
1515
import { ITerminalEditorService, ITerminalExternalLinkProvider, ITerminalGroupService, ITerminalInstance, ITerminalLink, ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
1616
import { TerminalProcessExtHostProxy } from 'vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy';
@@ -375,8 +375,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
375375
this._terminalProcessProxies.get(terminalId)?.emitData(data);
376376
}
377377

378-
public $sendProcessReady(terminalId: number, pid: number, cwd: string): void {
379-
this._terminalProcessProxies.get(terminalId)?.emitReady(pid, cwd);
378+
public $sendProcessReady(terminalId: number, pid: number, cwd: string, windowsPty: IProcessReadyWindowsPty | undefined): void {
379+
this._terminalProcessProxies.get(terminalId)?.emitReady(pid, cwd, windowsPty);
380380
}
381381

382382
public $sendProcessProperty(terminalId: number, property: IProcessProperty<any>): void {

0 commit comments

Comments
 (0)