Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions

View File

@@ -7,7 +7,7 @@ import { IViewlet } from 'vs/workbench/common/viewlet';
import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
import { Event } from 'vs/base/common/event';
import { ViewletDescriptor } from 'vs/workbench/browser/viewlet';
import { IProgressService } from 'vs/platform/progress/common/progress';
import { ILocalProgressService } from 'vs/platform/progress/common/progress';
export const IViewletService = createDecorator<IViewletService>('viewletService');
@@ -47,7 +47,7 @@ export interface IViewletService {
/**
* Returns the progress indicator for the side bar.
*/
getProgressIndicator(id: string): IProgressService | null;
getProgressIndicator(id: string): ILocalProgressService | null;
/**
* Hide the active viewlet.