development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Open the new editor group below

Browse source
This commit is contained in:
Peng Lyu 2019-05-24 14:55:26 -07:00
parent 9cd81dcb5b
commit 93944674c9
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extensions/merge-conflict/src/commandHandler.ts
View file

@ -127,11 +127,15 @@ export default class CommandHandler implements vscode.Disposable {
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,
viewColumn: vscode.ViewColumn.Active,
selection
};
vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title, opts);
if (openToTheSide) {
await vscode.commands.executeCommand('workbench.action.newGroupBelow');
}
await vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title, opts);
}
navigateNext(editor: vscode.TextEditor): Promise<void> {