mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
parent
a1e8a52697
commit
55a5e84230
|
@ -278,6 +278,10 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
|
|||
return;
|
||||
}
|
||||
this.input1View.editor.revealLineInCenter(firstConflict.input1Range.startLineNumber);
|
||||
transaction(tx => {
|
||||
/** @description setActiveModifiedBaseRange */
|
||||
viewModel.setActiveModifiedBaseRange(firstConflict, tx);
|
||||
});
|
||||
}));
|
||||
}
|
||||
|
||||
|
|
|
@ -124,6 +124,10 @@ export class MergeEditorViewModel extends Disposable {
|
|||
}
|
||||
);
|
||||
|
||||
public setActiveModifiedBaseRange(range: ModifiedBaseRange | undefined, tx: ITransaction): void {
|
||||
this.manuallySetActiveModifiedBaseRange.set({ range, counter: this.counter++ }, tx);
|
||||
}
|
||||
|
||||
public setState(
|
||||
baseRange: ModifiedBaseRange,
|
||||
state: ModifiedBaseRangeState,
|
||||
|
|
Loading…
Reference in a new issue