From a3f93ac6798cb48e24d5fd6e1981e0b9e99112e6 Mon Sep 17 00:00:00 2001 From: Aiday Marlen Kyzy Date: Wed, 17 Jan 2024 13:02:02 +0100 Subject: [PATCH 1/2] checking the variable _rebuildFromLine is undefined before doing early return --- .../editor/contrib/stickyScroll/browser/stickyScrollWidget.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts index f3b0974709c..72cec626e86 100644 --- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts +++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts @@ -127,7 +127,9 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget { } setState(_state: StickyScrollWidgetState | undefined, foldingModel: FoldingModel | null, _rebuildFromLine?: number): void { - if ((!this._previousState && !_state) || (this._previousState && this._previousState.equals(_state))) { + if (typeof _rebuildFromLine === 'undefined' && + ((!this._previousState && !_state) || (this._previousState && this._previousState.equals(_state))) + ) { return; } const isWidgetHeightZero = this._isWidgetHeightZero(_state); From 112b74e32b441b6a9c57a548107e3bb35142ad04 Mon Sep 17 00:00:00 2001 From: Aiday Marlen Kyzy Date: Wed, 17 Jan 2024 13:09:19 +0100 Subject: [PATCH 2/2] checking that _rebuildFromLine is undefined in the early return --- .../editor/contrib/stickyScroll/browser/stickyScrollWidget.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts index 72cec626e86..06fb2ce428f 100644 --- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts +++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts @@ -127,7 +127,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget { } setState(_state: StickyScrollWidgetState | undefined, foldingModel: FoldingModel | null, _rebuildFromLine?: number): void { - if (typeof _rebuildFromLine === 'undefined' && + if (_rebuildFromLine === undefined && ((!this._previousState && !_state) || (this._previousState && this._previousState.equals(_state))) ) { return;