Skip to content

Commit

Permalink
Merge pull request #229992 from microsoft/tyriar/229944
Browse files Browse the repository at this point in the history
Startup perf don't await pty host connection on web
  • Loading branch information
Tyriar committed Sep 27, 2024
2 parents e57ad41 + 71cabbe commit 83e902b
Showing 1 changed file with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { ITextResourceConfigurationService } from '../../../../editor/common/ser
import { Registry } from '../../../../platform/registry/common/platform.js';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, getWorkbenchContribution } from '../../../common/contributions.js';
import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.js';
import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';

export class PerfviewContrib {

Expand Down Expand Up @@ -111,6 +112,7 @@ class PerfModelContentProvider implements ITextModelContentProvider {
@ITimerService private readonly _timerService: ITimerService,
@IExtensionService private readonly _extensionService: IExtensionService,
@IProductService private readonly _productService: IProductService,
@IRemoteAgentService private readonly _remoteAgentService: IRemoteAgentService,
@ITerminalService private readonly _terminalService: ITerminalService
) { }

Expand Down Expand Up @@ -138,7 +140,8 @@ class PerfModelContentProvider implements ITextModelContentProvider {
this._timerService.whenReady(),
this._lifecycleService.when(LifecyclePhase.Eventually),
this._extensionService.whenInstalledExtensionsRegistered(),
this._terminalService.whenConnected
// The terminal service never connects to the pty host on the web
isWeb && this._remoteAgentService.getConnection() === null ? Promise.resolve() : this._terminalService.whenConnected
]).then(() => {
if (this._model && !this._model.isDisposed()) {

Expand Down

0 comments on commit 83e902b

Please sign in to comment.