Fix diff for new and removed notebooks

jupyterlab · Mar 2, 2021 · 57d080e · 57d080e
1 parent 820b11c
commit 57d080e
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/src/components/diff/notebook.ts b/src/components/diff/notebook.ts
@@ -95,8 +95,12 @@ export class NotebookDiff extends Panel {
         currentContent: headContent
       }
     );
-    data['baseMapping'] = Private.computeNotebookMapping(baseContent) as any;
-    data['headMapping'] = Private.computeNotebookMapping(headContent) as any;
+    data['baseMapping'] = Private.computeNotebookMapping(
+      baseContent || '{}'
+    ) as any;
+    data['headMapping'] = Private.computeNotebookMapping(
+      headContent || '{}'
+    ) as any;
     return data;
   }
 
@@ -294,15 +298,17 @@ namespace Private {
 
     return {
       metadata: {
-        start: parsedContent.pointers['/metadata'].key.line,
-        end: parsedContent.pointers['/metadata'].valueEnd.line
+        start: parsedContent.pointers['/metadata']?.key.line,
+        end: parsedContent.pointers['/metadata']?.valueEnd.line
       },
-      cells: parsedContent.data.cells.map((cell: any, index: number) => {
-        return {
-          start: parsedContent.pointers[`/cells/${index}`].value.line,
-          end: parsedContent.pointers[`/cells/${index}`].valueEnd.line
-        };
-      })
+      cells: (parsedContent.data.cells || []).map(
+        (cell: any, index: number) => {
+          return {
+            start: parsedContent.pointers[`/cells/${index}`].value.line,
+            end: parsedContent.pointers[`/cells/${index}`].valueEnd.line
+          };
+        }
+      )
     };
   }
   /**