Merge VS Code 1.23.1 (#1520)

This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions

View File

@@ -66,18 +66,21 @@ export enum ProgressLocation {
Explorer = 1,
Scm = 3,
Extensions = 5,
Window = 10
Window = 10,
Notification = 15
}
export interface IProgressOptions {
location: ProgressLocation;
title?: string;
tooltip?: string;
source?: string;
total?: number;
cancellable?: boolean;
}
export interface IProgressStep {
message?: string;
percentage?: number;
increment?: number;
}
export const IProgressService2 = createDecorator<IProgressService2>('progressService2');
@@ -86,5 +89,5 @@ export interface IProgressService2 {
_serviceBrand: any;
withProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, task: (progress: IProgress<IProgressStep>) => P): P;
withProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, task: (progress: IProgress<IProgressStep>) => P, onDidCancel?: () => void): P;
}