rename ProgressLocation.Scm to ProgressLocation.SourceControl, #18066

This commit is contained in:
Johannes Rieken 2017-04-25 11:45:27 +02:00
parent c5d2d86a70
commit 2d64239944
5 changed files with 6 additions and 6 deletions

View file

@ -531,7 +531,7 @@ export class Model implements Disposable {
};
return shouldShowProgress(operation)
? window.withProgress({ location: ProgressLocation.Scm }, run)
? window.withProgress({ location: ProgressLocation.SourceControl }, run)
: run();
}

4
src/vs/vscode.d.ts vendored
View file

@ -3955,10 +3955,10 @@ declare module 'vscode' {
export enum ProgressLocation {
/**
* Show progress for the scm viewlet, as overlay for the icon and as progress bar
* Show progress for the source control viewlet, as overlay for the icon and as progress bar
* inside the viewlet (when visible).
*/
Scm = 1,
SourceControl = 1,
/**
* Show progress in the status bar of the editor.

View file

@ -345,7 +345,7 @@ export function createApiFactory(
return extHostStatusBar.setStatusBarMessage(text, timeoutOrThenable);
},
withScmProgress<R>(task: (progress: vscode.Progress<number>) => Thenable<R>) {
return extHostProgress.withProgress(extension, { location: extHostTypes.ProgressLocation.Scm }, task);
return extHostProgress.withProgress(extension, { location: extHostTypes.ProgressLocation.SourceControl }, task);
},
withProgress<R>(options: vscode.ProgressOptions, task: (progress: vscode.Progress<{ message?: string; percentage?: number }>) => Thenable<R>) {
return extHostProgress.withProgress(extension, options, task);

View file

@ -409,7 +409,7 @@ export namespace EndOfLine {
export namespace ProgressLocation {
export function from(loc: vscode.ProgressLocation): MainProgressLocation {
switch (loc) {
case types.ProgressLocation.Scm: return MainProgressLocation.Scm;
case types.ProgressLocation.SourceControl: return MainProgressLocation.Scm;
case types.ProgressLocation.Window: return MainProgressLocation.Window;
}
return undefined;

View file

@ -1268,6 +1268,6 @@ export class ShellTask extends BaseTask {
}
export enum ProgressLocation {
Scm = 1,
SourceControl = 1,
Window = 10,
}