mirror of
https://github.com/Microsoft/vscode
synced 2024-08-28 13:29:44 +00:00
pin active editor when comparing with base (#161583)
fixes https://github.com/microsoft/vscode/issues/158958
This commit is contained in:
parent
377341351d
commit
4b3835a284
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue