keep cell run and toolbar below sticky -- fix microsoft#188690 (microsoft#188975)

* fix microsoft#188690 -- keep cell run and toolbar below sticky

* chain operator to avoid undefined issues

* fallback value

Author: Yoyokrazy

src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts

@@ -999,6 +999,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			height: this._dimension!.height,
 			fontInfo: this._fontInfo!,
 			scrollHeight: this._list?.getScrollHeight() ?? 0,
+			stickyHeight: 0,
 		};
 	}
 

src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts

@@ -179,6 +179,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	private _notebookTopToolbarContainer!: HTMLElement;
 	private _notebookTopToolbar!: NotebookEditorWorkbenchToolbar;
 	private _notebookStickyScrollContainer!: HTMLElement;
+	private _notebookStickyScroll!: NotebookStickyScroll;
 	private _notebookOverviewRulerContainer!: HTMLElement;
 	private _notebookOverviewRuler!: NotebookOverviewRuler;
 	private _body!: HTMLElement;
@@ -1046,7 +1047,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	}
 
 	private _registerNotebookStickyScroll() {
-		this._register(this.instantiationService.createInstance(NotebookStickyScroll, this._notebookStickyScrollContainer, this, this._notebookOutline, this._list));
+		this._notebookStickyScroll = this._register(this.instantiationService.createInstance(NotebookStickyScroll, this._notebookStickyScrollContainer, this, this._notebookOutline, this._list));
 	}
 
 	private _updateOutputRenderers() {
@@ -2601,7 +2602,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 			width: this._dimension?.width ?? 0,
 			height: this._dimension?.height ?? 0,
 			scrollHeight: this._list?.getScrollHeight() ?? 0,
-			fontInfo: this._fontInfo!
+			fontInfo: this._fontInfo!,
+			stickyHeight: this._notebookStickyScroll?.getCurrentStickyHeight() ?? 0
 		};
 	}
 

src/vs/workbench/contrib/notebook/browser/notebookViewEvents.ts

@@ -12,6 +12,7 @@ export interface NotebookLayoutInfo {
 	height: number;
 	scrollHeight: number;
 	fontInfo: FontInfo;
+	stickyHeight: number;
 }
 
 export interface CellViewModelStateChangeEvent {

src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbarStickyScroll.ts

@@ -15,9 +15,10 @@ export function registerCellToolbarStickyScroll(notebookEditor: INotebookEditor,
 		if (cell.isInputCollapsed) {
 			element.style.top = '';
 		} else {
+			const stickyHeight = notebookEditor.getLayoutInfo().stickyHeight;
 			const scrollTop = notebookEditor.scrollTop;
 			const elementTop = notebookEditor.getAbsoluteTopOfElement(cell);
-			const diff = scrollTop - elementTop + extraOffset;
+			const diff = scrollTop - elementTop + extraOffset + stickyHeight;
 			const maxTop = cell.layoutInfo.editorHeight + cell.layoutInfo.statusBarHeight - 45; // subtract roughly the height of the execution order label plus padding
 			const top = maxTop > 20 ? // Don't move the run button if it can only move a very short distance
 				clamp(min, diff, maxTop) :

src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts

@@ -90,6 +90,10 @@ export class NotebookStickyScroll extends Disposable {
 		return this.domNode;
 	}
 
+	getCurrentStickyHeight() {
+		return this.currentStickyLines.size * 22;
+	}
+
 	constructor(
 		private readonly domNode: HTMLElement,
 		private readonly notebookEditor: INotebookEditor,