Update getInteractiveCellMetadata callsites

microsoft · Sep 1, 2021 · 9a08f5c · 9a08f5c
1 parent 699447c
commit 9a08f5c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/client/datascience/editor-integration/cellhashprovider.ts b/src/client/datascience/editor-integration/cellhashprovider.ts
@@ -134,9 +134,9 @@ export class CellHashProvider implements ICellHashProvider {
         // Find the text document that matches. We need more information than
         // the add code gives us
         const { line: cellLine, file } = cell.metadata.interactive;
-        const id = getInteractiveCellMetadata(cell).id;
+        const id = getInteractiveCellMetadata(cell)?.id;
         const doc = this.documentManager.textDocuments.find((d) => this.fs.areLocalPathsSame(d.fileName, file));
-        if (doc) {
+        if (doc && id) {
             // Compute the code that will really be sent to jupyter
             const { stripped, trueStartLine } = this.extractStrippedLines(cell);
 

diff --git a/src/client/datascience/editor-integration/hoverProvider.ts b/src/client/datascience/editor-integration/hoverProvider.ts
@@ -57,7 +57,10 @@ export class HoverProvider implements INotebookExecutionLogger, IHoverProvider {
                 return;
             }
             const size = this.runFiles.size;
-            this.runFiles.add(getInteractiveCellMetadata(e.cell).interactive.file.toLocaleLowerCase());
+            const metadata = getInteractiveCellMetadata(e.cell);
+            if (metadata !== undefined) {
+                this.runFiles.add(metadata.interactive.file.toLocaleLowerCase());
+            }
             if (size !== this.runFiles.size) {
                 await this.initializeHoverProvider();
             }

diff --git a/src/client/datascience/interactive-window/interactiveWindow.ts b/src/client/datascience/interactive-window/interactiveWindow.ts
@@ -502,7 +502,7 @@ export class InteractiveWindow implements IInteractiveWindowLoadable {
         const notebookEditor = await this._editorReadyPromise;
         const matchingCell = notebookEditor.document
             .getCells()
-            .find((cell) => getInteractiveCellMetadata(cell).id === id);
+            .find((cell) => getInteractiveCellMetadata(cell)?.id === id);
         if (matchingCell) {
             this.revealCell(matchingCell, notebookEditor);
         }
@@ -516,13 +516,12 @@ export class InteractiveWindow implements IInteractiveWindowLoadable {
         }, 200); // Rendering output is async so the output is not guaranteed to immediately exist
     }
 
-    // TODO this does not need to be async since we no longer need to roundtrip to the UI
     public async hasCell(id: string): Promise<boolean> {
         const notebookEditor = await this._editorReadyPromise;
         if (!notebookEditor) {
             return false;
         }
-        return notebookEditor.document.getCells().some((cell) => getInteractiveCellMetadata(cell).id === id);
+        return notebookEditor.document.getCells().some((cell) => getInteractiveCellMetadata(cell)?.id === id);
     }
 
     public get owningResource(): Resource {