ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Vscode merge (#4582)

Browse Source 
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies
This commit is contained in:
Anthony Dresser
2019-03-19 17:44:35 -07:00
committed by GitHub
parent 833d197412
commit 87765e8673
1879 changed files with 54505 additions and 38058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/workbench/services/activity/browser/activityService.ts
View File

@@ -4,31 +4,27 @@
*--------------------------------------------------------------------------------------------*/
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';
import { IActivityService, IBadge } from 'vs/workbench/services/activity/common/activity';
import { IDisposable } from 'vs/base/common/lifecycle';
import { IActivityBarService } from 'vs/workbench/services/activityBar/browser/activityBarService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
export class ActivityService implements IActivityService {
public _serviceBrand: any;
constructor(
private activitybarPart: ActivitybarPart,
private panelPart: PanelPart,
@IPanelService private readonly panelService: IPanelService
@IPanelService private readonly panelService: IPanelService,
@IActivityBarService private readonly activityBarService: IActivityBarService
) { }
showActivity(compositeOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
if (this.panelService.getPanels().filter(p => p.id === compositeOrActionId).length) {
return this.panelPart.showActivity(compositeOrActionId, badge, clazz);
return this.panelService.showActivity(compositeOrActionId, badge, clazz);
}
return this.activitybarPart.showActivity(compositeOrActionId, badge, clazz, priority);
return this.activityBarService.showActivity(compositeOrActionId, badge, clazz, priority);
}
getPinnedViewletIds(): string[] {
return this.activitybarPart.getPinnedViewletIds();
}
}
registerSingleton(IActivityService, ActivityService, true);

8
src/vs/workbench/services/activity/common/activity.ts
View File

@@ -53,8 +53,7 @@ export class IconBadge extends BaseBadge {
}
}
export class ProgressBadge extends BaseBadge {
}
export class ProgressBadge extends BaseBadge { }
export const IActivityService = createDecorator<IActivityService>('activityService');
@@ -65,9 +64,4 @@ 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[];
}