Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Startup perf don't await pty host connection on web #229992

Merged
merged 1 commit into from
Sep 27, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading