Improves merge editor dev commands (#157706)

* Improves merge editor dev commands * Fixes layering issues.
microsoft · Aug 10, 2022 · f926f3a · f926f3a
1 parent b936110
commit f926f3a
Show file tree

Hide file tree

Showing 7 changed files with 322 additions and 181 deletions.
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.ts b/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.ts
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.ts
@@ -12,7 +12,6 @@ import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/
 import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
 import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
 import { AcceptAllInput1, AcceptAllInput2, CompareInput1WithBaseCommand, CompareInput2WithBaseCommand, GoToNextConflict, GoToPreviousConflict, OpenBaseFile, OpenMergeEditor, OpenResultResource, SetColumnLayout, SetMixedLayout, ToggleActiveConflictInput1, ToggleActiveConflictInput2 } from 'vs/workbench/contrib/mergeEditor/browser/commands/commands';
-import { MergeEditorCopyContentsToJSON, MergeEditorOpenContents } from 'vs/workbench/contrib/mergeEditor/browser/commands/devCommands';
 import { MergeEditorInput } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { MergeEditor, MergeEditorResolverContribution, MergeEditorOpenHandlerContribution } from 'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
@@ -54,9 +53,6 @@ registerAction2(SetColumnLayout);
 registerAction2(OpenMergeEditor);
 registerAction2(OpenBaseFile);
 
-registerAction2(MergeEditorCopyContentsToJSON);
-registerAction2(MergeEditorOpenContents);
-
 registerAction2(GoToNextConflict);
 registerAction2(GoToPreviousConflict);
 

diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts
@@ -259,7 +259,7 @@ class MergeEditorCloseHandler implements IEditorCloseHandler {
 		} else if (choice === 1) {
 			// discard: undo all changes and save original (pre-merge) state
 			for (const input of handler) {
-				input._discardMergeChanges();
+				input._model.discardMergeChanges();
 			}
 			return ConfirmResult.SAVE;
 
@@ -268,16 +268,4 @@ class MergeEditorCloseHandler implements IEditorCloseHandler {
 			return ConfirmResult.DONT_SAVE;
 		}
 	}
-
-	private _discardMergeChanges(): void {
-		const chunks: string[] = [];
-		while (true) {
-			const chunk = this._model.resultSnapshot.read();
-			if (chunk === null) {
-				break;
-			}
-			chunks.push(chunk);
-		}
-		this._model.result.setValue(chunks.join());
-	}
 }
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
@@ -120,7 +120,23 @@ export class MergeEditorModel extends EditorModel {
 		);
 	});
 
-	readonly resultSnapshot: ITextSnapshot;
+	private readonly resultSnapshot: ITextSnapshot;
+
+	public getInitialResultValue(): string {
+		const chunks: string[] = [];
+		while (true) {
+			const chunk = this.resultSnapshot.read();
+			if (chunk === null) {
+				break;
+			}
+			chunks.push(chunk);
+		}
+		return chunks.join();
+	}
+
+	public discardMergeChanges(): void {
+		this.result.setValue(this.getInitialResultValue());
+	}
 
 	constructor(
 		readonly base: ITextModel,