未验证 提交 8d7740fe 编写于 作者: D Daniel Imms 提交者: GitHub

Merge pull request #114944 from microsoft/merogge/integration

Prevent future integration test errors related to terminal
...@@ -360,7 +360,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape ...@@ -360,7 +360,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
public $sendResolvedLaunchConfig(terminalId: number, shellLaunchConfig: IShellLaunchConfig): void { public $sendResolvedLaunchConfig(terminalId: number, shellLaunchConfig: IShellLaunchConfig): void {
const instance = this._terminalService.getInstanceFromId(terminalId); const instance = this._terminalService.getInstanceFromId(terminalId);
if (instance) { if (instance) {
this._getTerminalProcess(terminalId).emitResolvedShellLaunchConfig(shellLaunchConfig); this._getTerminalProcess(terminalId)?.emitResolvedShellLaunchConfig(shellLaunchConfig);
} }
} }
...@@ -373,7 +373,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape ...@@ -373,7 +373,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
sw.stop(); sw.stop();
sum += sw.elapsed(); sum += sw.elapsed();
} }
this._getTerminalProcess(terminalId).emitLatency(sum / COUNT); this._getTerminalProcess(terminalId)?.emitLatency(sum / COUNT);
} }
private _isPrimaryExtHost(): boolean { private _isPrimaryExtHost(): boolean {
...@@ -398,10 +398,11 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape ...@@ -398,10 +398,11 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
} }
} }
private _getTerminalProcess(terminalId: number): ITerminalProcessExtHostProxy { private _getTerminalProcess(terminalId: number): ITerminalProcessExtHostProxy | undefined {
const terminal = this._terminalProcessProxies.get(terminalId); const terminal = this._terminalProcessProxies.get(terminalId);
if (!terminal) { if (!terminal) {
throw new Error(`Unknown terminal: ${terminalId}`); this._logService.error(`Unknown terminal: ${terminalId}`);
return undefined;
} }
return terminal; return terminal;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册