development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-05 19:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #213365

Browse source
This commit is contained in:
Henning Dieterichs 2024-06-06 18:08:09 +02:00 committed by Henning Dieterichs
parent f82523eb08
commit 2fb22a9ac0
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
View file

@ -5,7 +5,7 @@
import { getWindow, h } from 'vs/base/browser/dom';
import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
import { findLast } from 'vs/base/common/arraysFind';
import { onUnexpectedError } from 'vs/base/common/errors';
import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors';
import { Event } from 'vs/base/common/event';
import { toDisposable } from 'vs/base/common/lifecycle';
import { IObservable, ITransaction, autorun, autorunWithStore, derived, observableFromEvent, observableValue, recomputeInitiallyAndOnChange, subtransaction, transaction } from 'vs/base/common/observable';
@ -326,6 +326,17 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
this._register(autorunWithStore((reader, store) => {
store.add(new (readHotReloadableExport(RevertButtonsFeature, reader))(this._editors, this._diffModel, this._options, this));
}));
this._register(autorunWithStore((reader, store) => {
const model = this._diffModel.read(reader);
if (!model) { return; }
for (const m of [model.model.original, model.model.modified]) {
store.add(m.onWillDispose(e => {
onUnexpectedError(new BugIndicatingError('TextModel got disposed before DiffEditorWidget model got reset'));
this.setModel(null);
}));
}
}));
}
public getViewWidth(): number {