4
4
*--------------------------------------------------------------------------------------------*/
5
5
6
6
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' ;
8
8
import { ICodeEditor } from 'vs/editor/browser/editorBrowser' ;
9
+ import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget' ;
9
10
import { DiffModel } from 'vs/editor/browser/widget/diffEditorWidget2/diffModel' ;
10
11
import { EditorLayoutInfo } from 'vs/editor/common/config/editorOptions' ;
11
12
import { LineRange } from 'vs/editor/common/core/lineRange' ;
@@ -18,8 +19,8 @@ export class MovedBlocksLinesPart extends Disposable {
18
19
private readonly _diffModel : IObservable < DiffModel | undefined > ,
19
20
private readonly _originalEditorLayoutInfo : IObservable < EditorLayoutInfo | null > ,
20
21
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 ,
23
24
) {
24
25
super ( ) ;
25
26
@@ -41,9 +42,11 @@ export class MovedBlocksLinesPart extends Disposable {
41
42
42
43
const originalScrollTop = observableFromEvent ( this . _originalEditor . onDidScrollChange , ( ) => this . _originalEditor . getScrollTop ( ) ) ;
43
44
const modifiedScrollTop = observableFromEvent ( this . _modifiedEditor . onDidScrollChange , ( ) => this . _modifiedEditor . getScrollTop ( ) ) ;
45
+ const viewZonesChanged = observableSignalFromEvent ( 'onDidChangeViewZones' , this . _modifiedEditor . onDidChangeViewZones ) ;
44
46
45
47
this . _register ( autorun ( 'update' , ( reader ) => {
46
48
element . replaceChildren ( ) ;
49
+ viewZonesChanged . read ( reader ) ;
47
50
48
51
const info = this . _originalEditorLayoutInfo . read ( reader ) ;
49
52
const info2 = this . _modifiedEditorLayoutInfo . read ( reader ) ;
0 commit comments