Skip to content

Commit 25e9e85

Browse files
authored
Fixes redraw issue (microsoft#185601)
1 parent 8193f2f commit 25e9e85

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/vs/editor/browser/widget/diffEditorWidget2/movedBlocksLines.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { Disposable } from 'vs/base/common/lifecycle';
7-
import { IObservable, autorun, observableFromEvent } from 'vs/base/common/observable';
7+
import { IObservable, autorun, observableFromEvent, observableSignalFromEvent } from 'vs/base/common/observable';
88
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
9+
import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
910
import { DiffModel } from 'vs/editor/browser/widget/diffEditorWidget2/diffModel';
1011
import { EditorLayoutInfo } from 'vs/editor/common/config/editorOptions';
1112
import { LineRange } from 'vs/editor/common/core/lineRange';
@@ -18,8 +19,8 @@ export class MovedBlocksLinesPart extends Disposable {
1819
private readonly _diffModel: IObservable<DiffModel | undefined>,
1920
private readonly _originalEditorLayoutInfo: IObservable<EditorLayoutInfo | null>,
2021
private readonly _modifiedEditorLayoutInfo: IObservable<EditorLayoutInfo | null>,
21-
private readonly _originalEditor: ICodeEditor,
22-
private readonly _modifiedEditor: ICodeEditor,
22+
private readonly _originalEditor: CodeEditorWidget,
23+
private readonly _modifiedEditor: CodeEditorWidget,
2324
) {
2425
super();
2526

@@ -41,9 +42,11 @@ export class MovedBlocksLinesPart extends Disposable {
4142

4243
const originalScrollTop = observableFromEvent(this._originalEditor.onDidScrollChange, () => this._originalEditor.getScrollTop());
4344
const modifiedScrollTop = observableFromEvent(this._modifiedEditor.onDidScrollChange, () => this._modifiedEditor.getScrollTop());
45+
const viewZonesChanged = observableSignalFromEvent('onDidChangeViewZones', this._modifiedEditor.onDidChangeViewZones);
4446

4547
this._register(autorun('update', (reader) => {
4648
element.replaceChildren();
49+
viewZonesChanged.read(reader);
4750

4851
const info = this._originalEditorLayoutInfo.read(reader);
4952
const info2 = this._modifiedEditorLayoutInfo.read(reader);

0 commit comments

Comments
 (0)