Clicking the wrong RBL button should be a no-op

Fix #6868
microsoft · Aug 11, 2021 · 88e9742 · 88e9742
1 parent e0dc6dd
commit 88e9742
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/client/debugger/jupyter/debuggingManager.ts b/src/client/debugger/jupyter/debuggingManager.ts
@@ -197,19 +197,15 @@ export class DebuggingManager implements IExtensionSingleActivationService, IDeb
 
             this.commandManager.registerCommand(DSCommands.RunByLineContinue, (cell: NotebookCell) => {
                 const adapter = this.notebookToDebugAdapter.get(cell.notebook);
-                if (adapter) {
+                if (adapter && adapter.debugCellUri?.toString() === cell.document.uri.toString()) {
                     adapter.runByLineContinue();
-                } else {
-                    void this.appShell.showErrorMessage(DataScience.noNotebookToDebug());
                 }
             }),
 
             this.commandManager.registerCommand(DSCommands.RunByLineStop, (cell: NotebookCell) => {
                 const adapter = this.notebookToDebugAdapter.get(cell.notebook);
-                if (adapter) {
+                if (adapter && adapter.debugCellUri?.toString() === cell.document.uri.toString()) {
                     adapter.disconnect();
-                } else {
-                    void this.appShell.showErrorMessage(DataScience.noNotebookToDebug());
                 }
             }),
 

diff --git a/src/client/debugger/jupyter/kernelDebugAdapter.ts b/src/client/debugger/jupyter/kernelDebugAdapter.ts
@@ -14,7 +14,8 @@ import {
     notebooks,
     NotebookCellExecutionStateChangeEvent,
     NotebookCellExecutionState,
-    DebugConfiguration
+    DebugConfiguration,
+    Uri
 } from 'vscode';
 import { DebugProtocol } from 'vscode-debugprotocol';
 import { randomBytes } from 'crypto';
@@ -107,7 +108,11 @@ export interface IKernelDebugAdapterConfig extends DebugConfiguration {
 
 function assertIsDebugConfig(thing: unknown): asserts thing is IKernelDebugAdapterConfig {
     const config = thing as IKernelDebugAdapterConfig;
-    if (typeof config.__mode === 'undefined') {
+    if (
+        typeof config.__mode === 'undefined' ||
+        ((config.__mode === KernelDebugMode.Cell || config.__mode === KernelDebugMode.RunByLine) &&
+            typeof config.__cellIndex === 'undefined')
+    ) {
         throw new Error('Invalid launch configuration');
     }
 }
@@ -123,6 +128,7 @@ export class KernelDebugAdapter implements DebugAdapter, IKernelDebugAdapter, ID
     private threadId: number = 1;
     private readonly disposables: IDisposable[] = [];
     onDidSendMessage: Event<DebugProtocolMessage> = this.sendMessage.event;
+    public readonly debugCellUri: Uri | undefined;
 
     constructor(
         private session: DebugSession,
@@ -136,6 +142,10 @@ export class KernelDebugAdapter implements DebugAdapter, IKernelDebugAdapter, ID
         assertIsDebugConfig(configuration);
         this.configuration = configuration;
 
+        if (configuration.__mode === KernelDebugMode.Cell || configuration.__mode === KernelDebugMode.RunByLine) {
+            this.debugCellUri = notebookDocument.cellAt(configuration.__cellIndex!)?.document.uri;
+        }
+
         const iopubHandler = (msg: KernelMessage.IIOPubMessage) => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const content = msg.content as any;
@@ -458,7 +468,7 @@ export class KernelDebugAdapter implements DebugAdapter, IKernelDebugAdapter, ID
         });
 
         // put breakpoint at the beginning of the cell
-        const cellIndex = Number(this.session.configuration.__cellIndex);
+        const cellIndex = Number(this.configuration.__cellIndex);
         const cell = this.notebookDocument.cellAt(cellIndex);
 
         await this.dumpCell(cell.document.uri.toString());