Merge pull request microsoft#151133 from microsoft/3wm

Author: hediet

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

@@ -17,6 +17,13 @@ import { MergeEditorInput, MergeEditorInputData } from 'vs/workbench/contrib/mer
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { MergeEditorSerializer } from './mergeEditorSerializer';
 import { Codicon } from 'vs/base/common/codicons';
+import { IWorkbenchFileService } from 'vs/workbench/services/files/common/files';
+import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
+import { VSBuffer } from 'vs/base/common/buffer';
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
 
 Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
 	EditorPaneDescriptor.create(
@@ -152,3 +159,132 @@ interface IOpenEditorArgs {
 	input2: MergeEditorInputData;
 	output: URI;
 }
+
+registerAction2(class extends Action2 {
+
+	constructor() {
+		super({
+			id: 'merge.dev.copyContents',
+			title: localize('merge.dev.copyContents', "Developer Merge Editor: Copy Contents of Inputs, Base and Result as JSON"),
+			icon: Codicon.layoutCentered,
+			f1: true,
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const { activeEditorPane } = accessor.get(IEditorService);
+		const clipboardService = accessor.get(IClipboardService);
+		const notificationService = accessor.get(INotificationService);
+
+		if (!(activeEditorPane instanceof MergeEditor)) {
+			notificationService.info({
+				name: localize('mergeEditor.name', 'Merge Editor'),
+				message: localize('mergeEditor.noActiveMergeEditor', "No active merge editor")
+			});
+			return;
+		}
+		const model = activeEditorPane.model;
+		if (!model) {
+			return;
+		}
+		const contents: MergeEditorContents = {
+			languageId: model.result.getLanguageId(),
+			base: model.base.getValue(),
+			input1: model.input1.getValue(),
+			input2: model.input2.getValue(),
+			result: model.result.getValue(),
+		};
+		const jsonStr = JSON.stringify(contents, undefined, 4);
+		clipboardService.writeText(jsonStr);
+
+		notificationService.info({
+			name: localize('mergeEditor.name', 'Merge Editor'),
+			message: localize('mergeEditor.successfullyCopiedMergeEditorContents', "Successfully copied merge editor contents"),
+		});
+	}
+});
+
+registerAction2(class extends Action2 {
+
+	constructor() {
+		super({
+			id: 'merge.dev.openContents',
+			title: localize('merge.dev.openContents', "Developer Merge Editor: Open Contents of Inputs, Base and Result from JSON"),
+			icon: Codicon.layoutCentered,
+			f1: true,
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const service = accessor.get(IWorkbenchFileService);
+		const instaService = accessor.get(IInstantiationService);
+		const editorService = accessor.get(IEditorService);
+		const inputService = accessor.get(IQuickInputService);
+		const clipboardService = accessor.get(IClipboardService);
+		const textModelService = accessor.get(ITextModelService);
+
+		const result = await inputService.input({
+			prompt: localize('mergeEditor.enterJSON', 'Enter JSON'),
+			value: await clipboardService.readText(),
+		});
+		if (!result) {
+			return;
+		}
+
+		const content: MergeEditorContents = JSON.parse(result);
+
+		const scheme = 'merge-editor-dev';
+
+		let provider = service.getProvider(scheme) as InMemoryFileSystemProvider | undefined;
+		if (!provider) {
+			provider = new InMemoryFileSystemProvider();
+			service.registerProvider(scheme, provider);
+		}
+
+		const baseUri = URI.from({ scheme, path: '/ancestor' });
+		const input1Uri = URI.from({ scheme, path: '/input1' });
+		const input2Uri = URI.from({ scheme, path: '/input2' });
+		const resultUri = URI.from({ scheme, path: '/result' });
+
+		function writeFile(uri: URI, content: string): Promise<void> {
+			return provider!.writeFile(uri, VSBuffer.fromString(content).buffer, { create: true, overwrite: true, unlock: true });
+		}
+
+		await Promise.all([
+			writeFile(baseUri, content.base),
+			writeFile(input1Uri, content.input1),
+			writeFile(input2Uri, content.input2),
+			writeFile(resultUri, content.result),
+		]);
+
+		async function setLanguageId(uri: URI, languageId: string): Promise<void> {
+			const ref = await textModelService.createModelReference(uri);
+			ref.object.textEditorModel.setMode(languageId);
+			ref.dispose();
+		}
+
+		await Promise.all([
+			setLanguageId(baseUri, content.languageId),
+			setLanguageId(input1Uri, content.languageId),
+			setLanguageId(input2Uri, content.languageId),
+			setLanguageId(resultUri, content.languageId),
+		]);
+
+		const input = instaService.createInstance(
+			MergeEditorInput,
+			baseUri,
+			{ uri: input1Uri, description: 'Input 1', detail: '(from JSON)' },
+			{ uri: input2Uri, description: 'Input 2', detail: '(from JSON)' },
+			resultUri,
+		);
+		editorService.openEditor(input);
+	}
+});
+
+interface MergeEditorContents {
+	languageId: string;
+	base: string;
+	input1: string;
+	input2: string;
+	result: string;
+}

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

@@ -67,6 +67,9 @@ export class MergeEditor extends EditorPane {
 	private readonly _ctxIsMergeEditor: IContextKey<boolean>;
 	private readonly _ctxUsesColumnLayout: IContextKey<boolean>;
 
+	private _model: MergeEditorModel | undefined;
+	public get model(): MergeEditorModel | undefined { return this._model; }
+
 	constructor(
 		@IInstantiationService private readonly instantiation: IInstantiationService,
 		@ILabelService private readonly _labelService: ILabelService,
@@ -216,6 +219,7 @@ export class MergeEditor extends EditorPane {
 
 		this._sessionDisposables.clear();
 		const model = await input.resolve();
+		this._model = model;
 
 		this.input1View.setModel(model, model.input1, localize('yours', 'Yours'), model.input1Detail, model.input1Description);
 		this.input2View.setModel(model, model.input2, localize('theirs', 'Theirs',), model.input2Detail, model.input2Description);