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

Fixes #161967 (#162165)

Browse source
This commit is contained in:
Henning Dieterichs 2022-09-28 14:23:56 +02:00 committed by GitHub
parent a1e8a52697
commit 55a5e84230
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
View file

@ -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);
});
}));
}

4
src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
View file

@ -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,