Merge pull request microsoft#199064 from gjsjohnmurray/do-198248

Add 'Collapse All Diffs' action button to multi-diff editor

Author: hediet

src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorViewModel.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from 'vs/base/common/lifecycle';
-import { derivedWithStore, observableFromEvent, observableValue } from 'vs/base/common/observable';
+import { derivedWithStore, observableFromEvent, observableValue, transaction } from 'vs/base/common/observable';
 import { DiffEditorOptions } from 'vs/editor/browser/widget/diffEditor/diffEditorOptions';
 import { DiffEditorViewModel } from 'vs/editor/browser/widget/diffEditor/diffEditorViewModel';
 import { IDocumentDiffItem, IMultiDiffEditorModel, LazyPromise } from 'vs/editor/browser/widget/multiDiffEditorWidget/model';
@@ -27,6 +27,14 @@ export class MultiDiffEditorViewModel extends Disposable {
 		}
 	}
 
+	public collapseAll(): void {
+		transaction(tx => {
+			for (const d of this.items.get()) {
+				d.collapsed.set(true, tx);
+			}
+		});
+	}
+
 	constructor(
 		private readonly _model: IMultiDiffEditorModel,
 		private readonly _instantiationService: IInstantiationService,

src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.ts

@@ -23,6 +23,7 @@ import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/act
 import { URI } from 'vs/base/common/uri';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 
 class MultiDiffEditorResolverContribution extends Disposable {
@@ -128,7 +129,34 @@ export class GoToFileAction extends Action2 {
 	}
 }
 
+export class CollapseAllAction extends Action2 {
+	constructor() {
+		super({
+			id: 'multiDiffEditor.collapseAll',
+			title: { value: localize('collapseAllDiffs', "Collapse All Diffs"), original: 'Collapse All Diffs' },
+			icon: Codicon.collapseAll,
+			precondition: ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID),
+			menu: {
+				when: ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID),
+				id: MenuId.EditorTitle,
+				group: 'navigation',
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const activeEditor = editorService.activeEditor;
+
+		if (activeEditor instanceof MultiDiffEditorInput) {
+			const viewModel = await activeEditor.getViewModel();
+			viewModel.collapseAll();
+		}
+	}
+}
+
 registerAction2(GoToFileAction);
+registerAction2(CollapseAllAction);
 
 Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
 	properties: {

src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.ts

@@ -23,11 +23,18 @@ import { MultiDiffEditorInput } from 'vs/workbench/contrib/multiDiffEditor/brows
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { URI } from 'vs/base/common/uri';
+import { MultiDiffEditorViewModel } from 'vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorViewModel';
 
 export class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEditorViewState> {
 	static readonly ID = 'multiDiffEditor';
 
 	private _multiDiffEditorWidget: MultiDiffEditorWidget | undefined = undefined;
+	private _viewModel: MultiDiffEditorViewModel | undefined;
+
+	public get viewModel(): MultiDiffEditorViewModel | undefined {
+		return this._viewModel;
+	}
+
 
 	constructor(
 		@IInstantiationService instantiationService: InstantiationService,
@@ -65,8 +72,8 @@ export class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEdito
 
 	override async setInput(input: MultiDiffEditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
 		await super.setInput(input, options, context, token);
-		const vm = await input.getViewModel();
-		this._multiDiffEditorWidget!.setViewModel(vm);
+		this._viewModel = await input.getViewModel();
+		this._multiDiffEditorWidget!.setViewModel(this._viewModel);
 
 		const viewState = this.loadEditorViewState(input, context);
 		if (viewState) {