Fix microsoft#180876. Fix initial view rendering missed in find. (microsoft#182537)

Author: rebornix

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

@@ -1540,7 +1540,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		// make sure that the webview is not visible otherwise users will see pre-rendered markdown cells in wrong position as the list view doesn't have a correct `top` offset yet
 		this._webview!.element.style.visibility = 'hidden';
 		// warm up can take around 200ms to load markdown libraries, etc.
-		await this._warmupViewport(viewModel, viewState);
+		await this._warmupViewportMarkdownCells(viewModel, viewState);
 		this.logService.debug('NotebookEditorWidget', 'warmup - viewport warmed up');
 
 		// todo@rebornix @mjbvz, is this too complicated?
@@ -1564,7 +1564,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		this._onDidAttachViewModel.fire();
 	}
 
-	private async _warmupViewport(viewModel: NotebookViewModel, viewState: INotebookEditorViewState | undefined) {
+	private async _warmupViewportMarkdownCells(viewModel: NotebookViewModel, viewState: INotebookEditorViewState | undefined) {
 		if (viewState && viewState.cellTotalHeights) {
 			const totalHeightCache = viewState.cellTotalHeights;
 			const scrollTop = viewState.scrollPosition?.top ?? 0;
@@ -2404,7 +2404,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 			}
 
 			const result: IInsetRenderOutput = { type: RenderOutputType.Extension, renderer, source: output, mimeType: pickedMimeTypeRenderer.mimeType };
-			if (!this._webview?.insetMapping.has(result.source)) {
+			const inset = this._webview?.insetMapping.get(result.source);
+			if (!inset || !inset.initialized) {
 				const p = new Promise<void>(resolve => {
 					this._register(Event.any(this.onDidRenderOutput, this.onDidRemoveOutput)(e => {
 						if (e.model === result.source.model) {

src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts

@@ -66,6 +66,7 @@ export interface ICachedInset<K extends ICommonCellInfo> {
 	cellInfo: K;
 	renderer?: INotebookRendererInfo;
 	cachedCreation: ICreationRequestMessage;
+	initialized?: boolean;
 }
 
 export interface IResolvedBackLayerWebview {
@@ -612,6 +613,21 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 
 								this.reversedPendingWebviewIdleInsetMapping.delete(update.id);
 							}
+
+							{
+								if (!update.init) {
+									return;
+								}
+
+								const output = this.reversedInsetMapping.get(update.id);
+
+								if (!output) {
+									return;
+								}
+
+								const inset = this.insetMapping.get(output)!;
+								inset.initialized = true;
+							}
 						} else {
 							this.notebookEditor.updateMarkupCellHeight(update.id, height, !!update.init);
 						}

src/vs/workbench/contrib/search/browser/searchModel.ts

@@ -1533,6 +1533,7 @@ export class SearchResult extends Disposable {
 	private disposePastResults: () => void = () => { };
 	private _isDirty = false;
 	private _onWillChangeModelListener: IDisposable | undefined;
+	private _onDidChangeModelListener: IDisposable | undefined;
 
 	constructor(
 		private _searchModel: SearchModel,
@@ -1676,14 +1677,15 @@ export class SearchResult extends Disposable {
 			}
 		);
 
-		widget.onDidChangeModel(
-			(model) => {
-				if (model) {
-					this.onNotebookEditorWidgetAdded(widget, model?.uri);
+		this._onDidChangeModelListener?.dispose();
+		// listen to view model change as we are searching on both inputs and outputs
+		this._onDidChangeModelListener = widget.onDidAttachViewModel(
+			() => {
+				if (widget.hasModel()) {
+					this.onNotebookEditorWidgetAdded(widget, widget.textModel.uri);
 				}
 			}
 		);
-
 	}
 
 	private onModelAdded(model: ITextModel): void {
@@ -1894,6 +1896,7 @@ export class SearchResult extends Disposable {
 
 	override dispose(): void {
 		this._onWillChangeModelListener?.dispose();
+		this._onDidChangeModelListener?.dispose();
 		this.disposePastResults();
 		this.disposeMatches();
 		this._rangeHighlightDecorations.dispose();