maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix terminal dropdown rebuilding itself

Browse source 
Fixes #119589

Co-authored-by: Megan Rogge <merogge@microsoft.com>
This commit is contained in:
Daniel Imms 2021-03-24 11:16:44 -07:00
parent 8ceb8b9615
commit 0db170025e
No known key found for this signature in database
GPG key ID: D12BE8272D6284CC
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/vs/workbench/contrib/terminal/browser/terminalService.ts
View file

@ -33,6 +33,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la
import { ILifecycleService, ShutdownReason, WillShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
import { newQuickLaunchProfileIcon } from 'vs/workbench/contrib/terminal/browser/terminalIcons';
import { equals } from 'vs/base/common/objects';
interface IExtHostReadyEntry {
promise: Promise<void>;
@ -160,6 +161,12 @@ export class TerminalService implements ITerminalService {
const enableTerminalReconnection = this.configHelper.config.enablePersistentSessions;
const conn = this._remoteAgentService.getConnection();
const remoteAuthority = conn ? conn.remoteAuthority : 'null';
this._whenExtHostReady(remoteAuthority).then(() => {
this._updateAvailableProfiles();
});
// Connect to the extension host if it's there, set the connection state to connected when
// it's done. This should happen even when there is no extension host.
this._connectionState = TerminalConnectionState.Connecting;
@ -339,10 +346,10 @@ export class TerminalService implements ITerminalService {
// when relevant config changes, update without debouncing
private async _updateAvailableProfilesNow(): Promise<void> {
const result = await this._detectProfiles(true);
if (result !== this._availableProfiles) {
for (const p of result) {
p.isWorkspaceProfile = await this._getWorkspaceProfilePermissions(p);
}
for (const p of result) {
p.isWorkspaceProfile = await this._getWorkspaceProfilePermissions(p);
}
if (!equals(result, this._availableProfiles)) {
this._availableProfiles = result;
this._onProfilesConfigChanged.fire();
}
@ -366,7 +373,6 @@ export class TerminalService implements ITerminalService {
private async _whenExtHostReady(remoteAuthority: string): Promise<void> {
this._createExtHostReadyEntry(remoteAuthority);
this._updateAvailableProfiles();
return this._extHostsReady[remoteAuthority]!.promise;
}

1
src/vs/workbench/contrib/terminal/browser/terminalView.ts
View file

@ -382,7 +382,6 @@ class SwitchTerminalActionViewItem extends SelectActionViewItem {
this._register(_terminalService.onTabDisposed(() => this._updateItems(), this));
this._register(_terminalService.onDidChangeConnectionState(() => this._updateItems(), this));
this._register(_terminalService.onProfilesConfigChanged(() => this._updateItems(), this));
this._register(_terminalService.onRequestAvailableProfiles(() => this._updateItems(), this));
this._register(attachSelectBoxStyler(this.selectBox, this._themeService));
}