review comments

Signed-off-by: Jonah Iden <[email protected]>
eclipse-theia · Feb 21, 2024 · 91da624 · 91da624
1 parent 6f927c0
commit 91da624
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/packages/notebook/src/browser/notebook-editor-widget.tsx b/packages/notebook/src/browser/notebook-editor-widget.tsx
@@ -46,6 +46,11 @@ export function createNotebookEditorWidgetContainer(parent: interfaces.Container
 
 const NotebookEditorProps = Symbol('NotebookEditorProps');
 
+interface RenderMessage {
+    rendererId: string;
+    message: unknown;
+}
+
 export interface NotebookEditorProps {
     uri: URI,
     readonly notebookType: string,
@@ -90,11 +95,14 @@ export class NotebookEditorWidget extends ReactWidget implements Navigatable, Sa
     protected readonly onPostKernelMessageEmitter = new Emitter<unknown>();
     readonly onPostKernelMessage = this.onPostKernelMessageEmitter.event;
 
-    protected readonly onPostRendererMessageEmitter = new Emitter<{ rendererId: string; message: unknown }>();
+    protected readonly onDidPostKernelMessageEmitter = new Emitter<unknown>();
+    readonly onDidPostKernelMessage = this.onDidPostKernelMessageEmitter.event;
+
+    protected readonly onPostRendererMessageEmitter = new Emitter<RenderMessage>();
     readonly onPostRendererMessage = this.onPostRendererMessageEmitter.event;
 
-    protected readonly onDidRecieveKernelMessageEmitter = new Emitter<unknown>();
-    readonly onDidRecieveKernelMessage = this.onDidRecieveKernelMessageEmitter.event;
+    protected readonly onDidReceiveKernelMessageEmitter = new Emitter<unknown>();
+    readonly onDidRecieveKernelMessage = this.onDidReceiveKernelMessageEmitter.event;
 
     protected readonly renderers = new Map<CellKind, CellRenderer>();
     protected _model?: NotebookModel;
@@ -201,21 +209,22 @@ export class NotebookEditorWidget extends ReactWidget implements Navigatable, Sa
     }
 
     postKernelMessage(message: unknown): void {
-        this.onPostKernelMessageEmitter.fire(message);
+        this.onDidPostKernelMessageEmitter.fire(message);
     }
 
     postRendererMessage(rendererId: string, message: unknown): void {
         this.onPostRendererMessageEmitter.fire({ rendererId, message });
     }
 
     recieveKernelMessage(message: unknown): void {
-        this.onDidRecieveKernelMessageEmitter.fire(message);
+        this.onDidReceiveKernelMessageEmitter.fire(message);
     }
 
     override dispose(): void {
         this.onDidChangeModelEmitter.dispose();
-        this.onPostKernelMessageEmitter.dispose();
-        this.onDidRecieveKernelMessageEmitter.dispose();
+        this.onDidPostKernelMessageEmitter.dispose();
+        this.onDidReceiveKernelMessageEmitter.dispose();
+        this.onPostRendererMessageEmitter.dispose();
         super.dispose();
     }
 }
diff --git a/packages/plugin-ext/src/main/browser/notebooks/renderers/cell-output-webview.tsx b/packages/plugin-ext/src/main/browser/notebooks/renderers/cell-output-webview.tsx
@@ -98,7 +98,7 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
         }));
 
         if (this.editor) {
-            this.toDispose.push(this.editor.onPostKernelMessage(message => {
+            this.toDispose.push(this.editor.onDidPostKernelMessage(message => {
                 this.webviewWidget.sendMessage({
                     type: 'customKernelMessage',
                     message

diff --git a/packages/plugin-ext/src/plugin/notebook/notebook-kernels.ts b/packages/plugin-ext/src/plugin/notebook/notebook-kernels.ts
@@ -98,7 +98,7 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
             extensionId: extension.id,
             extensionLocation: toUriComponents(extension.packageUri),
             label: label || extension.id,
-            preloads: rendererScripts ? rendererScripts.map(preload => ({ uri: toUriComponents(preload.uri.toString()), provides: preload.provides })) : []
+            preloads: rendererScripts?.map(preload => ({ uri: toUriComponents(preload.uri.toString()), provides: preload.provides })) ?? []
         };
 
         //