Add progress indicator to SCM in activity bar while QuickDiff is pre…

…paring (#136968) (#136969)

src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts

@@ -51,6 +51,7 @@ import { gotoNextLocation, gotoPreviousLocation } from 'vs/platform/theme/common
 import { Codicon } from 'vs/base/common/codicons';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { TextCompareEditorActiveContext } from 'vs/workbench/common/editor';
+import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
 
 class DiffActionRunner extends ActionRunner {
 
@@ -1088,7 +1089,8 @@ export class DirtyDiffModel extends Disposable {
 		@ISCMService private readonly scmService: ISCMService,
 		@IEditorWorkerService private readonly editorWorkerService: IEditorWorkerService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ITextModelService private readonly textModelResolverService: ITextModelService
+		@ITextModelService private readonly textModelResolverService: ITextModelService,
+		@IProgressService private readonly progressService: IProgressService,
 	) {
 		super();
 		this._model = textFileModel;
@@ -1160,21 +1162,23 @@ export class DirtyDiffModel extends Disposable {
 	}
 
 	private diff(): Promise<IChange[] | null> {
-		return this.getOriginalURIPromise().then(originalURI => {
-			if (this._disposed || this._model.isDisposed() || !originalURI) {
-				return Promise.resolve([]); // disposed
-			}
+		return this.progressService.withProgress({ location: ProgressLocation.Scm }, async () => {
+			return this.getOriginalURIPromise().then(originalURI => {
+				if (this._disposed || this._model.isDisposed() || !originalURI) {
+					return Promise.resolve([]); // disposed
+				}
 
-			if (!this.editorWorkerService.canComputeDirtyDiff(originalURI, this._model.resource)) {
-				return Promise.resolve([]); // Files too large
-			}
+				if (!this.editorWorkerService.canComputeDirtyDiff(originalURI, this._model.resource)) {
+					return Promise.resolve([]); // Files too large
+				}
 
-			const ignoreTrimWhitespaceSetting = this.configurationService.getValue<'true' | 'false' | 'inherit'>('scm.diffDecorationsIgnoreTrimWhitespace');
-			const ignoreTrimWhitespace = ignoreTrimWhitespaceSetting === 'inherit'
-				? this.configurationService.getValue<boolean>('diffEditor.ignoreTrimWhitespace')
-				: ignoreTrimWhitespaceSetting !== 'false';
+				const ignoreTrimWhitespaceSetting = this.configurationService.getValue<'true' | 'false' | 'inherit'>('scm.diffDecorationsIgnoreTrimWhitespace');
+				const ignoreTrimWhitespace = ignoreTrimWhitespaceSetting === 'inherit'
+					? this.configurationService.getValue<boolean>('diffEditor.ignoreTrimWhitespace')
+					: ignoreTrimWhitespaceSetting !== 'false';
 
-			return this.editorWorkerService.computeDirtyDiff(originalURI, this._model.resource, ignoreTrimWhitespace);
+				return this.editorWorkerService.computeDirtyDiff(originalURI, this._model.resource, ignoreTrimWhitespace);
+			});
 		});
 	}