Merge pull request microsoft#202663 from microsoft/aiday/fixingColorizationStickyScroll

aiday-mar · web-flow · commit 25282a942e7f · 2024-01-18T09:14:05.000+01:00
Fixing incorrect colorization of tokens in sticky scroll
diff --git 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 (_rebuildFromLine === undefined &&
+			((!this._previousState && !_state) || (this._previousState && this._previousState.equals(_state)))
+		) {
 			return;
 		}
 		const isWidgetHeightZero = this._isWidgetHeightZero(_state);

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,9 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`setState(_state: StickyScrollWidgetState \| undefined, foldingModel: FoldingModel \| null, _rebuildFromLine?: number): void {`
`130`		`- if ((!this._previousState && !_state) \|\| (this._previousState && this._previousState.equals(_state))) {`
	`130`	`+ if (_rebuildFromLine === undefined &&`
	`131`	`+ ((!this._previousState && !_state) \|\| (this._previousState && this._previousState.equals(_state)))`
	`132`	`+ ) {`
`131`	`133`	`return;`
`132`	`134`	`}`
`133`	`135`	`const isWidgetHeightZero = this._isWidgetHeightZero(_state);`