fix bug that causes error output when execution an empty cell

allen-li1231 · Jan 25, 2024 · 8ad8d3b · 8ad8d3b
1 parent f5081ea
commit 8ad8d3b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/common/dataStructure.ts b/src/common/dataStructure.ts
@@ -68,7 +68,7 @@ export interface ParagraphSetting {
 
 export interface ParagraphResult {
     code: string;
-    msg: ParagraphResultMsg[]
+    msg?: ParagraphResultMsg[]
 }
 
 export interface ParagraphResultMsg {

diff --git a/src/common/parser.ts b/src/common/parser.ts
@@ -36,11 +36,11 @@ export function parseParagraphResultToCellOutput(
     let encoder = new TextEncoder();
     let textOutput = '', htmlOutput = '', errorOutput = '';
     let imageOutputs: Uint8Array[] = [];
-    for (let msg of results['msg']) {
-        if (msg['type'] === 'HTML') {
+    for (let msg of results.msg ?? []) {
+        if (msg.type === 'HTML') {
             htmlOutput += msg.data;
         }
-        else if (msg['type'] === 'IMG') {
+        else if (msg.type === 'IMG') {
             let data = Uint8Array.from(atob(msg.data), c => c.charCodeAt(0));
             imageOutputs.push(data);
         }

diff --git a/src/extension/notebookKernel.ts b/src/extension/notebookKernel.ts
@@ -701,7 +701,11 @@ export class ZeppelinKernel {
             cell.notebook.metadata.id, cell.metadata.id, sync
         );
         if (!sync) {
-            return res?.data;
+            return res?.data ?? [];
+        }
+
+        if (!res?.data.body) {
+            return [];
         }
 
         let paragraphResult = <ParagraphResult> res?.data.body;
@@ -768,9 +772,9 @@ export class ZeppelinKernel {
         try {
             await this.instantUpdatePollingParagraphs();
 
-            let cellOutput = await this._runParagraph(cell, true);
             execution.start(Date.now());
-            if (cellOutput.length > 0) {
+            let cellOutput = await this._runParagraph(cell, true);
+            if (cellOutput && cellOutput.length > 0) {
                 execution.replaceOutput(new vscode.NotebookCellOutput(cellOutput));
             }
             else {