development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 04:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes #162195 (#162353)

Browse source
This commit is contained in:
Henning Dieterichs 2022-09-29 17:03:48 +02:00 committed by GitHub
parent f8ba3353d1
commit f1d4fced59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 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/conflictActions.ts
View file

@ -86,6 +86,10 @@ export class ConflictActionsFactory extends Disposable {
}
const items = derived('items', reader => {
if (!viewModel.model.hasBaseRange(modifiedBaseRange)) {
return [];
}
const state = viewModel.model.getState(modifiedBaseRange).read(reader);
const handled = viewModel.model.isHandled(modifiedBaseRange).read(reader);
const model = viewModel.model;