-add iopub message signal

-remove debugger UI code -remove logs -normalize paths
microsoft · Jun 18, 2021 · e9bfc0d · e9bfc0d
1 parent 4626bbf
commit e9bfc0d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 32 deletions.
diff --git a/src/client/datascience/baseJupyterSession.ts b/src/client/datascience/baseJupyterSession.ts
@@ -63,6 +63,12 @@ export abstract class BaseJupyterSession implements IJupyterSession {
         }
         return this.onStatusChangedEvent.event;
     }
+    public get onIOPubMessageSignal(): Event<KernelMessage.IIOPubMessage> {
+        if (!this.ioPubEventEmitter) {
+            this.ioPubEventEmitter = new EventEmitter<KernelMessage.IIOPubMessage>();
+        }
+        return this.ioPubEventEmitter.event;
+    }
 
     public get status(): ServerStatus {
         return this.getServerStatus();

diff --git a/src/client/datascience/types.ts b/src/client/datascience/types.ts
@@ -319,6 +319,7 @@ export interface IDebuggingManager {}
 export const IJupyterSession = Symbol('IJupyterSession');
 export interface IJupyterSession extends IAsyncDisposable {
     onSessionStatusChanged: Event<ServerStatus>;
+    onIOPubMessageSignal: Event<KernelMessage.IIOPubMessage>;
     readonly status: ServerStatus;
     readonly workingDirectory: string;
     readonly kernelSocket: Observable<KernelSocketInformation | undefined>;

diff --git a/src/client/debugger/jupyter/debuggingManager.ts b/src/client/debugger/jupyter/debuggingManager.ts
@@ -34,7 +34,6 @@ export class DebuggingManager implements IDebuggingManager, IExtensionSingleActi
                 for (const [doc, dbg] of this.notebookToDebugger.entries()) {
                     if (dbg && session === (await dbg.session)) {
                         this.notebookToDebugger.delete(doc);
-                        this.updateDebuggerUI(doc, false);
                         break;
                     }
                 }
@@ -125,7 +124,6 @@ export class DebuggingManager implements IDebuggingManager, IExtensionSingleActi
     }
 
     private async toggleDebugging(doc: vscode.NotebookDocument) {
-        let showBreakpointMargin = false;
         let dbg = this.notebookToDebugger.get(doc);
         if (dbg) {
             await dbg.stop();
@@ -136,17 +134,13 @@ export class DebuggingManager implements IDebuggingManager, IExtensionSingleActi
             await this.kernelProvider.get(doc.uri); // ensure the kernel is running
             try {
                 await dbg.session;
-                showBreakpointMargin = true;
             } catch (err) {
                 vscode.window.showErrorMessage(`Can't start debugging (${err})`);
             }
-            this.updateDebuggerUI(doc, showBreakpointMargin);
         }
     }
 
     private async getDebuggerByUri(document: vscode.NotebookDocument): Promise<Debugger> {
-        let showBreakpointMargin = false;
-
         for (const [doc, dbg] of this.notebookToDebugger.entries()) {
             if (document.uri.toString() === doc.uri.toString()) {
                 return dbg;
@@ -156,23 +150,13 @@ export class DebuggingManager implements IDebuggingManager, IExtensionSingleActi
         const dbg = new Debugger(document);
         this.notebookToDebugger.set(document, dbg);
         await this.kernelProvider.get(document.uri); // ensure the kernel is running
-        try {
-            await dbg.session;
-            showBreakpointMargin = true;
-        } catch (err) {
-            vscode.window.showErrorMessage(`Can't start debugging (${err})`);
-        }
-        this.updateDebuggerUI(document, showBreakpointMargin);
+        // try {
+        //     await dbg.session;
+        // } catch (err) {
+        //     vscode.window.showErrorMessage(`Can't start debugging (${err})`);
+        // }
         return dbg;
     }
-
-    private updateDebuggerUI(doc: vscode.NotebookDocument, showBreakpointsMargin: boolean) {
-        for (const cell of doc.getCells()) {
-            if (cell.kind === vscode.NotebookCellKind.Code) {
-                cell.metadata.breakpointMargin = showBreakpointsMargin;
-            }
-        }
-    }
 }
 
 class Debugger {

diff --git a/src/client/debugger/jupyter/kernelDebugAdapter.ts b/src/client/debugger/jupyter/kernelDebugAdapter.ts
@@ -25,11 +25,16 @@ export class KernelDebugAdapter implements vscode.DebugAdapter {
         private session: vscode.DebugSession,
         private notebookDocument: vscode.NotebookDocument,
         private readonly jupyterSession: IJupyterSession
-    ) {}
+    ) {
+        const iopubHandler = (msg: KernelMessage.IIOPubMessage) => {
+            if ((msg.content as any).event === 'stopped') {
+                this.sendMessage.fire(msg.content);
+            }
+        };
+        this.jupyterSession.onIOPubMessageSignal(iopubHandler);
+    }
 
     async handleMessage(message: DebugProtocol.ProtocolMessage) {
-        // console.log('-> send', message);
-
         // intercept 'setBreakpoints' request
         if (message.type === 'request' && (message as DebugProtocol.Request).command === 'setBreakpoints') {
             const args = (message as DebugProtocol.Request).arguments;
@@ -60,8 +65,6 @@ export class KernelDebugAdapter implements vscode.DebugAdapter {
             if (control) {
                 control.onReply = (msg) => {
                     visitSources(msg.content, (source) => {
-                        console.error('------------------ onReply ------------');
-                        console.error(msg);
                         if (source && source.path) {
                             const cell = this.fileToCell.get(source.path);
                             if (cell) {
@@ -78,8 +81,6 @@ export class KernelDebugAdapter implements vscode.DebugAdapter {
                 };
                 control.onIOPub = (msg) => {
                     visitSources(msg.content as DebugProtocol.ProtocolMessage, (source) => {
-                        console.error('------------------ onIOPub ------------');
-                        console.error(msg);
                         if (source && source.path) {
                             const cell = this.fileToCell.get(source.path);
                             if (cell) {
@@ -96,8 +97,6 @@ export class KernelDebugAdapter implements vscode.DebugAdapter {
                 };
                 control.onStdin = (msg) => {
                     visitSources(msg.content as DebugProtocol.ProtocolMessage, (source) => {
-                        console.error('------------------ onStdin ------------');
-                        console.error(msg);
                         if (source && source.path) {
                             const cell = this.fileToCell.get(source.path);
                             if (cell) {
@@ -141,8 +140,9 @@ export class KernelDebugAdapter implements vscode.DebugAdapter {
         if (cell) {
             try {
                 const response = await this.session.customRequest('dumpCell', { code: cell.document.getText() });
-                this.fileToCell.set(response.sourcePath, cell);
-                this.cellToFile.set(cell.document.uri.toString(), response.sourcePath);
+                const norm = path.normalize(response.sourcePath);
+                this.fileToCell.set(norm, cell);
+                this.cellToFile.set(cell.document.uri.toString(), norm);
             } catch (err) {
                 console.log(err);
             }

diff --git a/src/test/datascience/mockJupyterSession.ts b/src/test/datascience/mockJupyterSession.ts
@@ -60,6 +60,9 @@ export class MockJupyterSession implements IJupyterSession {
         }
         return this.onStatusChangedEvent.event;
     }
+    public get onIOPubMessageSignal(): Event<KernelMessage.IIOPubMessage> {
+        return new EventEmitter<KernelMessage.IIOPubMessage>().event;
+    }
     public get status(): ServerStatus {
         return this._status;
     }