Support debugging IW using Jupyter protocol #10105
Conversation
| const firstExecutableLineIndex = lineList.length | ||
| ? metadata.interactive.line + lineList[0] | ||
| : metadata.interactive.line; | ||
| return { stripped, trueStartLine, firstExecutableLineIndex }; |
There was a problem hiding this comment.
Need the first executable line as we need to add a breakpoint to that line.
| */ | ||
| @injectable() | ||
| export class InteractiveWindowDebuggingManager | ||
| extends DebuggingManagerBase |
There was a problem hiding this comment.
Moved a lot of stuff into a base class
| import { getInteractiveCellMetadata } from '../../../interactive-window/helpers'; | ||
| import { KernelDebugAdapterBase } from '../../../kernels/debugger/kernelDebugAdapterBase'; | ||
|
|
||
| export class KernelDebugAdapter extends KernelDebugAdapterBase { |
There was a problem hiding this comment.
Moved a lot of stuff into a base class
| public generateCode( | ||
| metadata: Pick<InteractiveCellMetadata, 'interactive' | 'id'>, | ||
| debug: boolean, | ||
| usingJupyterDebugProtocol?: boolean |
There was a problem hiding this comment.
Added argument to decide what kind of debugging code is to be added.
Didn't want to pass in IKernel or other stuff.
the desire is that we'll switch over to the new Jupyter protocol debugger for everything and deprecate the old IW debugger code
| @@ -519,7 +522,7 @@ export class InteractiveWindow implements IInteractiveWindowLoadable { | |||
| const promises = cells.map((c) => { | |||
| // Add the cell first. We don't need to wait for this part as we want to add them | |||
| // as quickly as possible | |||
| const notebookCellPromise = this.addNotebookCell(c, fileUri, line, isDebug); | |||
| const notebookCellPromise = this.addNotebookCell(c, fileUri, line); | |||
There was a problem hiding this comment.
We cannot generate the code for IW cell at this stage, it can only be done once we have resolved the kernel.
E.g. if using remote kernel, then we don't inject debugger() statement.
|
|
||
| const metadata: InteractiveCellMetadata = { | ||
| interactiveWindowCellMarker, | ||
| interactive, | ||
| generatedCode, | ||
| id: uuid() |
There was a problem hiding this comment.
Found a bug, the id passed into the generated code was wrong, as that's not whats stored in the metadata.
I.e. line 754 and 763 use two different ids.
| }; | ||
|
|
||
| const edit = new WorkspaceEdit(); | ||
| const cellEdit = NotebookEdit.updateCellMetadata(cell.index, newMetadata); |
There was a problem hiding this comment.
The IW code is generated only after we resolve the kernel.
Once we have a single debugger implementation we should be able to move this back into the place where the cell is created.
| break; | ||
| case 'breakpoint': | ||
| sourceHook((event as DebugProtocol.BreakpointEvent).body.breakpoint.source); | ||
| sourceHook( |
There was a problem hiding this comment.
Added ability to translate the line numbers as well.
Codecov Report
@@ Coverage Diff @@
## main #10105 +/- ##
=====================================
Coverage 64% 64%
=====================================
Files 203 203
Lines 9239 9241 +2
Branches 1488 1488
=====================================
+ Hits 5927 5929 +2
Misses 2852 2852
Partials 460 460
|
DonJayamanne
force-pushed
the
issue10037Part2
branch
from
bd7265d
to
6ccc99d
Compare
Fixes #10037
Todo:
[ ] Add tests