Merge from vscode 5b9869eb02fa4c96205a74d05cad9164dfd06d60 (#5607)

This commit is contained in:
Anthony Dresser
2019-05-24 12:20:30 -07:00
committed by GitHub
parent 361ada4963
commit bcc449b524
126 changed files with 3096 additions and 2255 deletions

View File

@@ -204,12 +204,13 @@ export class CompositeBar extends Widget implements ICompositeBar {
return toDisposable(() => this.model.removeActivity(compositeId, activity));
}
pin(compositeId: string, open?: boolean): void {
async pin(compositeId: string, open?: boolean): Promise<void> {
if (this.model.setPinned(compositeId, true)) {
this.updateCompositeSwitcher();
if (open) {
this.options.openComposite(compositeId).then(() => this.activateComposite(compositeId)); // Activate after opening
await this.options.openComposite(compositeId);
this.activateComposite(compositeId); // Activate after opening
}
}
}