Remove createRawHtml output method for notebook renderers (#7246)

Author: nstrayer

src/vs/workbench/contrib/positronOutputWebview/browser/notebookOutputWebviewService.ts

@@ -77,20 +77,5 @@ export interface IPositronNotebookOutputWebviewService {
 			viewType?: string;
 		}): Promise<INotebookOutputWebview | undefined>;
 
-	/**
-	 * Create a new raw HTML output webview.
-	 *
-	 * @param opts The options for the webview
-	 * @param opts.id A unique ID for this webview; typically the ID of the message
-	 *  that created it.
-	 * @param opts.runtimeOrSessionId The runtime that owns this webview. Can also be a string of the ID of the runtime.
-	 * @param opts.html The HTML content to render in the webview.
-	 * @returns A promise that resolves to the new webview of the desired type.
-	 */
-	createRawHtmlOutput(opts: {
-		id: string;
-		html: string;
-		runtimeOrSessionId: ILanguageRuntimeSession | string;
-	}): Promise<INotebookOutputWebview>;
 }
 

src/vs/workbench/contrib/positronOutputWebview/browser/notebookOutputWebviewServiceImpl.ts

@@ -16,13 +16,11 @@ import { NotebookOutputWebview } from './notebookOutputWebview.js';
 import { INotebookOutputWebview, IPositronNotebookOutputWebviewService } from './notebookOutputWebviewService.js';
 import { IWebviewService, WebviewInitInfo } from '../../webview/browser/webview.js';
 import { asWebviewUri } from '../../webview/common/webview.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { ILanguageRuntimeMessageWebOutput } from '../../../services/languageRuntime/common/languageRuntimeService.js';
 import { ILanguageRuntimeSession } from '../../../services/runtimeSession/common/runtimeSessionService.js';
 import { dirname } from '../../../../base/common/resources.js';
 import { INotebookRendererMessagingService } from '../../notebook/common/notebookRendererMessagingService.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { handleWebviewLinkClicksInjection } from './downloadUtils.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { webviewMessageCodeString } from '../../positronWebviewPreloads/browser/notebookOutputUtils.js';
 
@@ -45,7 +43,6 @@ export class PositronNotebookOutputWebviewService implements IPositronNotebookOu
 		@IWebviewService private readonly _webviewService: IWebviewService,
 		@INotebookService private readonly _notebookService: INotebookService,
 		@IWorkspaceTrustManagementService private readonly _workspaceTrustManagementService: IWorkspaceTrustManagementService,
-		@IExtensionService private readonly _extensionService: IExtensionService,
 		@INotebookRendererMessagingService private readonly _notebookRendererMessagingService: INotebookRendererMessagingService,
 		@ILogService private _logService: ILogService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService
@@ -147,7 +144,6 @@ export class PositronNotebookOutputWebviewService implements IPositronNotebookOu
 		for (const mimeType of Object.keys(output.data)) {
 			// Don't use a renderer for non-widget MIME types
 			if (mimeType === 'text/plain' ||
-				mimeType === 'text/html' ||
 				mimeType === 'image/png') {
 				continue;
 			}
@@ -163,18 +159,6 @@ export class PositronNotebookOutputWebviewService implements IPositronNotebookOu
 			}
 		}
 
-		// If no dedicated renderer is found, check to see if there is a raw
-		// HTML representation of the output.
-		for (const mimeType of Object.keys(output.data)) {
-			if (mimeType === 'text/html') {
-				return this.createRawHtmlOutput({
-					id,
-					runtimeOrSessionId: runtime,
-					html: output.data[mimeType],
-				});
-			}
-		}
-
 		// No renderer found
 		return Promise.resolve(undefined);
 	}
@@ -394,70 +378,6 @@ export class PositronNotebookOutputWebviewService implements IPositronNotebookOu
 		return notebookOutputWebview;
 	}
 
-	async createRawHtmlOutput({ id, html, runtimeOrSessionId }: {
-		id: string;
-		html: string;
-		runtimeOrSessionId: ILanguageRuntimeSession | string;
-	}): Promise<INotebookOutputWebview> {
-
-		// Load the Jupyter extension. Many notebook HTML outputs have a dependency on jQuery,
-		// which is provided by the Jupyter extension.
-		const jupyterExtension = await this._extensionService.getExtension('ms-toolsai.jupyter');
-		if (!jupyterExtension) {
-			return Promise.reject(`Jupyter extension 'ms-toolsai.jupyter' not found`);
-		}
-
-		// Create the metadata for the webview
-		const webviewInitInfo: WebviewInitInfo = {
-			// Use the active window's origin. All webviews with the same origin will reuse the same
-			// service worker.
-			origin: DOM.getActiveWindow().origin,
-			contentOptions: {
-				allowScripts: true,
-				localResourceRoots: [jupyterExtension.extensionLocation]
-			},
-			options: {},
-			title: '',
-			// Sometimes we don't have an active runtime (e.g. rendering html for a notebook pre
-			// runtime start) so we can't get the extension id from the runtime.
-			extension: typeof runtimeOrSessionId === 'string' ? undefined : { id: runtimeOrSessionId.runtimeMetadata.extensionId }
-		};
-
-		const webview = this._webviewService.createWebviewOverlay(webviewInitInfo);
-
-		// Form the path to the jQuery library and inject it into the HTML
-		const jQueryPath = asWebviewUri(
-			jupyterExtension.extensionLocation.with({
-				path: jupyterExtension.extensionLocation.path +
-					'/out/node_modules/jquery/dist/jquery.min.js'
-			}));
-
-		webview.setHtml(`
-<script src='${jQueryPath}'></script>
-${PositronNotebookOutputWebviewService.CssAddons}
-${html}
-<script>
-const vscode = acquireVsCodeApi();
-window.onload = function() {
-	vscode.postMessage({
-		__vscode_notebook_message: true,
-		type: 'positronRenderComplete',
-	});
-
-	${handleWebviewLinkClicksInjection};
-};
-</script>`);
-
-		return this._instantiationService.createInstance(
-			NotebookOutputWebview,
-			{
-				id,
-				sessionId: typeof runtimeOrSessionId === 'string' ? runtimeOrSessionId : runtimeOrSessionId.sessionId,
-				webview
-			}
-		);
-	}
-
 	/**
 	 * A set of CSS addons to inject into the HTML of the webview. Used to do things like
 	 * hide elements that are not functional in the context of positron such as links to

src/vs/workbench/contrib/positronWebviewPreloads/browser/positronWebviewPreloadsService.ts

@@ -15,7 +15,6 @@ import { UiFrontendEvent } from '../../../services/languageRuntime/common/positr
 import { VSBuffer } from '../../../../base/common/buffer.js';
 import { isWebviewDisplayMessage, isWebviewReplayMessage } from './utils.js';
 import { IPositronNotebookInstance } from '../../../services/positronNotebook/browser/IPositronNotebookInstance.js';
-import { buildWebviewHTML, webviewMessageCodeString } from './notebookOutputUtils.js';
 
 /**
  * Format of output from a notebook cell
@@ -153,17 +152,15 @@ export class PositronWebviewPreloadService extends Disposable implements IPositr
 	 * @param outputs Array of output objects containing mime types to check
 	 * @returns The type of webview message ('display', 'preload') or null if not handled
 	 */
-	static getWebviewMessageType(outputs: { mime: string }[]): NotebookPreloadOutputResults['preloadMessageType'] | 'html' | null {
+	static getWebviewMessageType(outputs: { mime: string }[]): NotebookPreloadOutputResults['preloadMessageType'] | null {
 		const mimeTypes = outputs.map(output => output.mime);
 		if (isWebviewDisplayMessage(mimeTypes)) {
 			return 'display';
 		}
 		if (isWebviewReplayMessage(mimeTypes)) {
 			return 'preload';
 		}
-		if (mimeTypes.includes('text/html')) {
-			return 'html';
-		}
+
 		return null;
 	}
 
@@ -209,42 +206,11 @@ export class PositronWebviewPreloadService extends Disposable implements IPositr
 			};
 		}
 
-		// We also want to send plain (non preload reliant) html messages to output.
-		if (messageType === 'html') {
-			return {
-				preloadMessageType: 'display',
-				webview: this._handleHtmlOutput(instance, outputId, outputs)
-			};
-		}
-
 		// Preload messages contain setup code or dependencies that need to be stored
 		// for future webviews but don't need to be displayed themselves
 		notebookMessages.push(runtimeOutput);
 		return { preloadMessageType: messageType };
 	}
-
-	/**
-	 * Create a webview for a plain html output.
-	 */
-	private async _handleHtmlOutput(instance: IPositronNotebookInstance, outputId: NotebookOutput['outputId'], outputs: NotebookOutput['outputs']) {
-
-		// Get the output with mime type of html
-		const htmlOutput = outputs.find(output => output.mime === 'text/html');
-		if (!htmlOutput) {
-			throw new Error('Expected HTML output');
-		}
-
-		const notebookWebview = await this._notebookOutputWebviewService.createRawHtmlOutput({
-			id: outputId,
-			runtimeOrSessionId: instance.id,
-			html: buildWebviewHTML({
-				content: htmlOutput.data.toString(),
-				script: webviewMessageCodeString,
-			})
-		});
-
-		return notebookWebview;
-	}
 	/**
 	 * Create a plot client for a display message by replaying all the associated previous messages.
 	 * Alerts the plots pane that a new plot is ready.