mirror of
https://github.com/Microsoft/vscode
synced 2024-09-13 13:46:13 +00:00
parent
f8ba3353d1
commit
f1d4fced59
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue