diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts index 0de9f402c24..40907d2a3e3 100644 --- a/extensions/git/src/model.ts +++ b/extensions/git/src/model.ts @@ -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(); } diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 2744ef49e7d..1dc663b0a14 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -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. diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index a465e11886a..2a8214a42c8 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -345,7 +345,7 @@ export function createApiFactory( return extHostStatusBar.setStatusBarMessage(text, timeoutOrThenable); }, withScmProgress(task: (progress: vscode.Progress) => Thenable) { - return extHostProgress.withProgress(extension, { location: extHostTypes.ProgressLocation.Scm }, task); + return extHostProgress.withProgress(extension, { location: extHostTypes.ProgressLocation.SourceControl }, task); }, withProgress(options: vscode.ProgressOptions, task: (progress: vscode.Progress<{ message?: string; percentage?: number }>) => Thenable) { return extHostProgress.withProgress(extension, options, task); diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts index 6900cbf1e1c..18a58541dca 100644 --- a/src/vs/workbench/api/node/extHostTypeConverters.ts +++ b/src/vs/workbench/api/node/extHostTypeConverters.ts @@ -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; diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts index 323e4e304a9..d8279811f68 100644 --- a/src/vs/workbench/api/node/extHostTypes.ts +++ b/src/vs/workbench/api/node/extHostTypes.ts @@ -1268,6 +1268,6 @@ export class ShellTask extends BaseTask { } export enum ProgressLocation { - Scm = 1, + SourceControl = 1, Window = 10, }