Adds title property to command.

Renames 3wm editor default titles to input1/input2.

Author: hediet

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

@@ -58,20 +58,21 @@ namespace IRelaxedOpenArgs {
 
 	function toInputResource(obj: unknown): MergeEditorInputData {
 		if (typeof obj === 'string') {
-			return new MergeEditorInputData(URI.parse(obj, true), undefined, undefined);
+			return new MergeEditorInputData(URI.parse(obj, true), undefined, undefined, undefined);
 		}
 		if (!obj || typeof obj !== 'object') {
 			throw new TypeError('invalid argument');
 		}
 
 		if (isUriComponents(obj)) {
-			return new MergeEditorInputData(URI.revive(obj), undefined, undefined);
+			return new MergeEditorInputData(URI.revive(obj), undefined, undefined, undefined);
 		}
 
+		const title = (<IRelaxedInputData>obj).title;
 		const uri = toUri((<IRelaxedInputData>obj).uri);
 		const detail = (<IRelaxedInputData>obj).detail;
 		const description = (<IRelaxedInputData>obj).description;
-		return new MergeEditorInputData(uri, detail, description);
+		return new MergeEditorInputData(uri, title, detail, description);
 	}
 
 	export function validate(obj: unknown): IOpenEditorArgs {
@@ -86,7 +87,7 @@ namespace IRelaxedOpenArgs {
 	}
 }
 
-type IRelaxedInputData = { uri: UriComponents; detail?: string; description?: string };
+type IRelaxedInputData = { uri: UriComponents; title?: string; detail?: string; description?: string };
 
 type IRelaxedOpenArgs = {
 	ancestor: UriComponents | string;

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

@@ -139,8 +139,8 @@ export class MergeEditorOpenContents extends Action2 {
 		const input = instaService.createInstance(
 			MergeEditorInput,
 			baseUri,
-			{ uri: input1Uri, description: 'Input 1', detail: '(from JSON)' },
-			{ uri: input2Uri, description: 'Input 2', detail: '(from JSON)' },
+			{ uri: input1Uri, title: 'Input 1', description: 'Input 1', detail: '(from JSON)' },
+			{ uri: input2Uri, title: 'Input 2', description: 'Input 2', detail: '(from JSON)' },
 			resultUri,
 		);
 		editorService.openEditor(input);

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

@@ -20,14 +20,15 @@ import { ITextFileEditorModel, ITextFileService } from 'vs/workbench/services/te
 
 export interface MergeEditorInputJSON {
 	anchestor: URI;
-	inputOne: { uri: URI; detail?: string; description?: string };
-	inputTwo: { uri: URI; detail?: string; description?: string };
+	inputOne: { uri: URI; title?: string; detail?: string; description?: string };
+	inputTwo: { uri: URI; title?: string; detail?: string; description?: string };
 	result: URI;
 }
 
 export class MergeEditorInputData {
 	constructor(
 		readonly uri: URI,
+		readonly title: string | undefined,
 		readonly detail: string | undefined,
 		readonly description: string | undefined,
 	) { }
@@ -109,9 +110,11 @@ export class MergeEditorInput extends AbstractTextResourceEditorInput {
 				MergeEditorModel,
 				base.object.textEditorModel,
 				input1.object.textEditorModel,
+				this._input1.title,
 				this._input1.detail,
 				this._input1.description,
 				input2.object.textEditorModel,
+				this._input2.title,
 				this._input2.detail,
 				this._input2.description,
 				result.object.textEditorModel

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

@@ -25,8 +25,8 @@ export class MergeEditorSerializer implements IEditorSerializer {
 			return instantiationService.createInstance(
 				MergeEditorInput,
 				data.anchestor,
-				new MergeEditorInputData(data.inputOne.uri, data.inputOne.detail, data.inputOne.description),
-				new MergeEditorInputData(data.inputTwo.uri, data.inputTwo.detail, data.inputTwo.description),
+				new MergeEditorInputData(data.inputOne.uri, data.inputOne.title, data.inputOne.detail, data.inputOne.description),
+				new MergeEditorInputData(data.inputTwo.uri, data.inputTwo.title, data.inputTwo.detail, data.inputTwo.description),
 				data.result
 			);
 		} catch (err) {

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

@@ -126,9 +126,11 @@ export class MergeEditorModel extends EditorModel {
 	constructor(
 		readonly base: ITextModel,
 		readonly input1: ITextModel,
+		readonly input1Title: string | undefined,
 		readonly input1Detail: string | undefined,
 		readonly input1Description: string | undefined,
 		readonly input2: ITextModel,
+		readonly input2Title: string | undefined,
 		readonly input2Detail: string | undefined,
 		readonly input2Description: string | undefined,
 		readonly result: ITextModel,

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

@@ -230,8 +230,8 @@ export class MergeEditor extends AbstractTextEditor<any> {
 
 		const viewModel = new MergeEditorViewModel(model, this.input1View, this.input2View, this.inputResultView);
 
-		this.input1View.setModel(viewModel, model.input1, localize('yours', 'Yours'), model.input1Detail, model.input1Description);
-		this.input2View.setModel(viewModel, model.input2, localize('theirs', 'Theirs',), model.input2Detail, model.input2Description);
+		this.input1View.setModel(viewModel, model.input1, model.input1Title || localize('input1', 'Input 1'), model.input1Detail, model.input1Description);
+		this.input2View.setModel(viewModel, model.input2, model.input2Title || localize('input2', 'Input 2',), model.input2Detail, model.input2Description);
 		this.inputResultView.setModel(viewModel, model.result, localize('result', 'Result',), this._labelService.getUriLabel(model.result.uri, { relative: true }), undefined);
 		this._ctxBaseResourceScheme.set(model.base.uri.scheme);