Support open diff in new editor group

rebornix · rebornix · commit b917a0341db7 · 2019-05-24T11:29:30.000-07:00
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
@@ -125,6 +125,11 @@
           "type": "number",
           "description": "%config.diffViewContext%",
           "default": 0
+        },
+        "merge-conflict.openDiffInNewEditor": {
+          "type": "boolean",
+          "description": "%config.openDiffInNewEditor%",
+          "default": false
         }
       }
     }
diff --git a/extensions/merge-conflict/package.nls.json b/extensions/merge-conflict/package.nls.json
@@ -17,5 +17,6 @@
 	"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.diffViewContext": "Controls how many unchanged lines around the merge conflict should be displayed in the diff view."
+	"config.diffViewContext": "Controls how many unchanged lines around the merge conflict should be displayed in the diff view.",
+	"config.openDiffInNewEditor": "Controls if the diff view should be opened in a new editor group when comparing changes in merge conflicts."
 }
diff --git a/extensions/merge-conflict/src/commandHandler.ts b/extensions/merge-conflict/src/commandHandler.ts
@@ -100,7 +100,12 @@ export default class CommandHandler implements vscode.Disposable {
 		const rightUri = leftUri.with({ query: JSON.stringify({ scheme, range, fullRange: conflict.range }) });
 
 		const title = localize('compareChangesTitle', '{0}: Current Changes ⟷ Incoming Changes', fileName);
-		vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title);
+		const mergeConflictConfig = vscode.workspace.getConfiguration('merge-conflict');
+		const openToTheside = mergeConflictConfig.get<boolean>('openDiffInNewEditor');
+		const opts: vscode.TextDocumentShowOptions = {
+			viewColumn: openToTheside ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active
+		};
+		vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title, opts);
 	}
 
 	async compareAll(editor: vscode.TextEditor) {
@@ -125,7 +130,13 @@ export default class CommandHandler implements vscode.Disposable {
 		const rightUri = leftUri.with({ query: JSON.stringify({ type: 'full', scheme, ranges: rightRanges }) });
 
 		const title = localize('compareChangesTitle', '{0}: Current Changes ⟷ Incoming Changes', fileName);
-		vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title);
+		const mergeConflictConfig = vscode.workspace.getConfiguration('merge-conflict');
+		const openToTheside = mergeConflictConfig.get<boolean>('openDiffInNewEditor');
+		const opts: vscode.TextDocumentShowOptions = {
+			viewColumn: openToTheside ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active
+		};
+
+		vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title, opts);
 	}
 
 	navigateNext(editor: vscode.TextEditor): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,11 @@`
`125`	`125`	`"type": "number",`
`126`	`126`	`"description": "%config.diffViewContext%",`
`127`	`127`	`"default": 0`
	`128`	`+ },`
	`129`	`+ "merge-conflict.openDiffInNewEditor": {`
	`130`	`+ "type": "boolean",`
	`131`	`+ "description": "%config.openDiffInNewEditor%",`
	`132`	`+ "default": false`
`128`	`133`	`}`
`129`	`134`	`}`
`130`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@`
`17`	`17`	`"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",`
`18`	`18`	`"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",`
`19`	`19`	`"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",`
`20`		`- "config.diffViewContext": "Controls how many unchanged lines around the merge conflict should be displayed in the diff view."`
	`20`	`+ "config.diffViewContext": "Controls how many unchanged lines around the merge conflict should be displayed in the diff view.",`
	`21`	`+ "config.openDiffInNewEditor": "Controls if the diff view should be opened in a new editor group when comparing changes in merge conflicts."`
`21`	`22`	`}`