Skip to content

Commit 3214d06

Browse files
committed
Fix compile after merge
1 parent 7f4221a commit 3214d06

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@
55

66
import { FileAccess } from 'vs/base/common/network';
77
import { Client, IIPCOptions } from 'vs/base/parts/ipc/node/ipc.cp';
8-
import { canUseUtilityProcess } from 'vs/base/parts/sandbox/electron-main/electronTypes';
98
import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
109
import { parsePtyHostDebugPort } from 'vs/platform/environment/node/environmentService';
1110
import { IReconnectConstants } from 'vs/platform/terminal/common/terminal';
12-
import { NodePtyHostStarter } from 'vs/platform/terminal/node/nodePtyHostStarter';
1311
import { IPtyHostConnection, IPtyHostStarter } from 'vs/platform/terminal/node/ptyHost';
1412
import { UtilityProcess } from 'vs/platform/utilityProcess/electron-main/utilityProcess';
1513

1614
export class ElectronPtyHostStarter implements IPtyHostStarter {
1715

1816
private utilityProcess: UtilityProcess | undefined = undefined;
19-
private readonly useUtilityProcess = canUseUtilityProcess;
2017

2118
constructor(
2219
private readonly _reconnectConstants: IReconnectConstants,
@@ -26,9 +23,7 @@ export class ElectronPtyHostStarter implements IPtyHostStarter {
2623
}
2724

2825
start(lastPtyId: number): IPtyHostConnection {
29-
if (!this.useUtilityProcess) {
30-
return new NodePtyHostStarter(this._reconnectConstants, this._isRemote, this._environmentService).start(lastPtyId);
31-
}
26+
// return new NodePtyHostStarter(this._reconnectConstants, this._isRemote, this._environmentService).start(lastPtyId);
3227

3328
console.log('use utility proc');
3429

src/vs/server/node/serverServices.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
197197
graceTime: ProtocolConstants.ReconnectionGraceTime,
198198
shortGraceTime: ProtocolConstants.ReconnectionShortGraceTime,
199199
scrollback: configurationService.getValue<number>(TerminalSettingId.PersistentSessionScrollback) ?? 100
200-
}
200+
},
201+
true
201202
);
202203
const ptyService = instantiationService.createInstance(PtyHostService, ptyHostStarter);
203204
services.set(IPtyService, ptyService);

0 commit comments

Comments
 (0)