Fix restart when the notebook editor is not active.

Skip ipykernel check on restart to avoiding needing an editor. Fix #11789
microsoft · Oct 27, 2022 · 22a6b72 · 22a6b72
1 parent 9307d25
commit 22a6b72
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/notebooks/debugger/controllers/restartController.ts b/src/notebooks/debugger/controllers/restartController.ts
@@ -47,7 +47,7 @@ export class RestartController implements IDebuggingDelegate {
                     .disconnect()
                     .then(() => {
                         this.trace('restart', 'doRestart');
-                        return this.debuggingManager.tryToStartDebugging(this.mode, this.debugCell);
+                        return this.debuggingManager.tryToStartDebugging(this.mode, this.debugCell, true);
                     })
                     .catch((err) => {
                         this.error('restart', `Error restarting: ${err}`);

diff --git a/src/notebooks/debugger/debuggingManager.ts b/src/notebooks/debugger/debuggingManager.ts
@@ -124,15 +124,20 @@ export class DebuggingManager
         this.debugDocuments.set(Array.from(debugDocumentUris.values())).ignoreErrors();
     }
 
-    public async tryToStartDebugging(mode: KernelDebugMode, cell: NotebookCell) {
+    public async tryToStartDebugging(mode: KernelDebugMode, cell: NotebookCell, skipIpykernelCheck = false) {
         traceInfo(`Starting debugging with mode ${mode}`);
 
-        const ipykernelResult = await this.checkIpykernelAndPrompt(cell);
-        if (ipykernelResult === IpykernelCheckResult.Ok) {
-            if (mode === KernelDebugMode.RunByLine || mode === KernelDebugMode.Cell) {
-                await this.startDebuggingCell(mode, cell!);
+        if (!skipIpykernelCheck) {
+            const ipykernelResult = await this.checkIpykernelAndPrompt(cell);
+            if (ipykernelResult !== IpykernelCheckResult.Ok) {
+                traceInfo(`Ipykernel check failed: ${IpykernelCheckResult[ipykernelResult]}`);
+                return;
             }
         }
+
+        if (mode === KernelDebugMode.RunByLine || mode === KernelDebugMode.Cell) {
+            await this.startDebuggingCell(mode, cell!);
+        }
     }
 
     public runByLineNext(cell: NotebookCell) {

diff --git a/src/notebooks/debugger/debuggingTypes.ts b/src/notebooks/debugger/debuggingTypes.ts
@@ -82,7 +82,7 @@ export interface IDebuggingManager {
 
 export const INotebookDebuggingManager = Symbol('INotebookDebuggingManager');
 export interface INotebookDebuggingManager extends IDebuggingManager {
-    tryToStartDebugging(mode: KernelDebugMode, cell: NotebookCell): Promise<void>;
+    tryToStartDebugging(mode: KernelDebugMode, cell: NotebookCell, skipIpykernelCheck?: boolean): Promise<void>;
     runByLineNext(cell: NotebookCell): void;
     runByLineStop(cell: NotebookCell): void;
 }