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

pin active editor when comparing with base (#161583)

Browse source 
fixes https://github.com/microsoft/vscode/issues/158958
This commit is contained in:
Johannes Rieken 2022-09-23 11:45:10 +02:00 committed by GitHub
parent 377341351d
commit 4b3835a284
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts
View file

@ -461,6 +461,9 @@ export class CompareInput2WithBaseCommand extends MergeEditorAction {
}
async function mergeEditorCompare(viewModel: MergeEditorViewModel, editorService: IEditorService, inputNumber: 1 | 2) {
editorService.openEditor(editorService.activeEditor!, { pinned: true });
const model = viewModel.model;
const base = model.base;
const input = inputNumber === 1 ? viewModel.inputCodeEditorView1.editor : viewModel.inputCodeEditorView2.editor;