Merge from master

This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions

View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart';
import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart';
@@ -28,4 +26,9 @@ export class ActivityService implements IActivityService {
return this.activitybarPart.showActivity(compositeOrActionId, badge, clazz, priority);
}
getPinnedViewletIds(): string[] {
return this.activitybarPart.getPinnedViewletIds();
}
}

View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import { IDisposable } from 'vs/base/common/lifecycle';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -67,4 +65,9 @@ export interface IActivityService {
* Show activity in the panel for the given panel or in the activitybar for the given viewlet or global action.
*/
showActivity(compositeOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable;
/**
* Returns id of pinned viewlets following the visual order
*/
getPinnedViewletIds(): string[];
}