ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-07 17:23:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 718331d6f3ebd1b571530ab499edb266ddd493d5

Browse Source
This commit is contained in:
ADS Merger
2020-02-08 04:50:58 +00:00
parent 8c61538a27
commit 2af13c18d2
752 changed files with 16458 additions and 10063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/browser/workbench.ts
View File

@@ -46,6 +46,7 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia
import { Layout } from 'vs/workbench/browser/layout';
import { IHostService } from 'vs/workbench/services/host/browser/host';
import { ILanguageAssociationRegistry, Extensions as LanguageExtensions } from 'sql/workbench/common/languageAssociation';
import { Extensions as PanelExtensions, PanelRegistry } from 'vs/workbench/browser/panel';
export class Workbench extends Layout {
@@ -441,9 +442,16 @@ export class Workbench extends Layout {
// Restore Panel
if (this.state.panel.panelToRestore) {
mark('willRestorePanel');
panelService.openPanel(this.state.panel.panelToRestore);
mark('didRestorePanel');
restorePromises.push((async () => {
mark('willRestorePanel');
const panel = await panelService.openPanel(this.state.panel.panelToRestore!);
if (!panel) {
await panelService.openPanel(Registry.as<PanelRegistry>(PanelExtensions.Panels).getDefaultPanelId()); // fallback to default panel as needed
}
mark('didRestorePanel');
})());
}
// Restore Zen Mode