Open the diff view in current editor, to the side or below.

rebornix · rebornix · commit c3fe962b89dc · 2019-05-24T15:26:50.000-07:00
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
@@ -115,10 +115,15 @@
           "description": "%config.autoNavigateNextConflictEnabled%",
           "default": false
         },
-        "merge-conflict.openDiffInNewEditor": {
-          "type": "boolean",
-          "description": "%config.openDiffInNewEditor%",
-          "default": false
+        "merge-conflict.diffViewPosition": {
+          "type": "string",
+          "enum": [
+            "Current",
+            "Beside",
+            "Below"
+          ],
+          "description": "%config.diffViewPosition%",
+          "default": "Current"
         }
       }
     }
diff --git a/extensions/merge-conflict/package.nls.json b/extensions/merge-conflict/package.nls.json
@@ -16,5 +16,5 @@
 	"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",
 	"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
 	"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",
-	"config.openDiffInNewEditor": "Controls if the diff view should be opened in a new editor group when comparing changes in merge conflicts."
+	"config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts."
 }
diff --git a/extensions/merge-conflict/src/commandHandler.ts b/extensions/merge-conflict/src/commandHandler.ts
@@ -125,13 +125,13 @@ export default class CommandHandler implements vscode.Disposable {
 
 		const title = localize('compareChangesTitle', '{0}: Current Changes ⟷ Incoming Changes', fileName);
 		const mergeConflictConfig = vscode.workspace.getConfiguration('merge-conflict');
-		const openToTheSide = mergeConflictConfig.get<boolean>('openDiffInNewEditor');
+		const openToTheSide = mergeConflictConfig.get<string>('diffViewPosition');
 		const opts: vscode.TextDocumentShowOptions = {
-			viewColumn: vscode.ViewColumn.Active,
+			viewColumn: openToTheSide === 'Beside' ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active,
 			selection
 		};
 
-		if (openToTheSide) {
+		if (openToTheSide === 'Below') {
 			await vscode.commands.executeCommand('workbench.action.newGroupBelow');
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@`
`16`	`16`	`"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",`
`17`	`17`	`"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",`
`18`	`18`	`"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",`
`19`		`- "config.openDiffInNewEditor": "Controls if the diff view should be opened in a new editor group when comparing changes in merge conflicts."`
	`19`	`+ "config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts."`
`20`	`20`	`}`