leverage notebookDocument parameter typing to be nb|Uri|undefined for…

… openInteractive
anthonykim1 · Nov 19, 2024 · 639caaf · 639caaf
1 parent 435c200
commit 639caaf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/client/repl/nativeRepl.ts b/src/client/repl/nativeRepl.ts
@@ -165,8 +165,7 @@ export class NativeRepl implements Disposable {
 
         const notebookEditor = await openInteractiveREPL(
             this.replController,
-            this.notebookDocument,
-            wsMementoUri,
+            this.notebookDocument ?? wsMementoUri,
             preserveFocus,
         );
         if (notebookEditor) {

diff --git a/src/client/repl/replCommandHandler.ts b/src/client/repl/replCommandHandler.ts
@@ -20,15 +20,13 @@ import { PVSC_EXTENSION_ID } from '../common/constants';
  */
 export async function openInteractiveREPL(
     notebookController: NotebookController,
-    notebookDocument: NotebookDocument | undefined,
-    mementoValue: Uri | undefined,
+    notebookDocument: NotebookDocument | Uri | undefined,
     preserveFocus: boolean = true,
 ): Promise<NotebookEditor | undefined> {
     let viewColumn = ViewColumn.Beside;
-    if (mementoValue) {
-        if (!notebookDocument) {
-            notebookDocument = await workspace.openNotebookDocument(mementoValue as Uri);
-        }
+    if (notebookDocument instanceof Uri) {
+        // Case where NotebookDocument is undefined, but workspace mementoURI exists.
+        notebookDocument = await workspace.openNotebookDocument(notebookDocument);
     } else if (notebookDocument) {
         // Case where NotebookDocument (REPL document already exists in the tab)
         const existingReplViewColumn = getExistingReplViewColumn(notebookDocument);