@jupyterlab/debugger 4.0.0-alpha.9 → 4.0.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/debugger.d.ts +3 -1
- package/lib/debugger.js +5 -3
- package/lib/debugger.js.map +1 -1
- package/lib/dialogs/evaluate.d.ts +5 -0
- package/lib/dialogs/evaluate.js +16 -6
- package/lib/dialogs/evaluate.js.map +1 -1
- package/lib/factory.d.ts +1 -1
- package/lib/factory.js +15 -9
- package/lib/factory.js.map +1 -1
- package/lib/handler.js +15 -7
- package/lib/handler.js.map +1 -1
- package/lib/handlers/console.js +9 -3
- package/lib/handlers/console.js.map +1 -1
- package/lib/handlers/editor.d.ts +26 -12
- package/lib/handlers/editor.js +166 -89
- package/lib/handlers/editor.js.map +1 -1
- package/lib/handlers/file.js +6 -2
- package/lib/handlers/file.js.map +1 -1
- package/lib/handlers/notebook.d.ts +0 -7
- package/lib/handlers/notebook.js +11 -17
- package/lib/handlers/notebook.js.map +1 -1
- package/lib/icons.d.ts +2 -1
- package/lib/icons.js +6 -1
- package/lib/icons.js.map +1 -1
- package/lib/model.js +1 -0
- package/lib/model.js.map +1 -1
- package/lib/panels/breakpoints/index.d.ts +2 -2
- package/lib/panels/breakpoints/index.js +9 -7
- package/lib/panels/breakpoints/index.js.map +1 -1
- package/lib/panels/breakpoints/pauseonexceptions.d.ts +53 -0
- package/lib/panels/breakpoints/pauseonexceptions.js +98 -0
- package/lib/panels/breakpoints/pauseonexceptions.js.map +1 -0
- package/lib/panels/callstack/index.d.ts +1 -1
- package/lib/panels/kernelSources/body.d.ts +5 -7
- package/lib/panels/kernelSources/body.js +37 -47
- package/lib/panels/kernelSources/body.js.map +1 -1
- package/lib/panels/kernelSources/filter.d.ts +1 -2
- package/lib/panels/kernelSources/filter.js +2 -2
- package/lib/panels/kernelSources/filter.js.map +1 -1
- package/lib/panels/kernelSources/index.js +1 -1
- package/lib/panels/kernelSources/index.js.map +1 -1
- package/lib/panels/kernelSources/model.d.ts +10 -1
- package/lib/panels/kernelSources/model.js +19 -1
- package/lib/panels/kernelSources/model.js.map +1 -1
- package/lib/panels/sources/body.js +5 -3
- package/lib/panels/sources/body.js.map +1 -1
- package/lib/panels/sources/sourcepath.js +1 -1
- package/lib/panels/sources/sourcepath.js.map +1 -1
- package/lib/panels/variables/grid.d.ts +23 -10
- package/lib/panels/variables/grid.js +42 -367
- package/lib/panels/variables/grid.js.map +1 -1
- package/lib/panels/variables/gridpanel.d.ts +138 -0
- package/lib/panels/variables/gridpanel.js +362 -0
- package/lib/panels/variables/gridpanel.js.map +1 -0
- package/lib/panels/variables/mimerenderer.js +9 -1
- package/lib/panels/variables/mimerenderer.js.map +1 -1
- package/lib/panels/variables/scope.js +4 -0
- package/lib/panels/variables/scope.js.map +1 -1
- package/lib/panels/variables/tree.d.ts +1 -0
- package/lib/panels/variables/tree.js +136 -47
- package/lib/panels/variables/tree.js.map +1 -1
- package/lib/service.d.ts +20 -6
- package/lib/service.js +84 -59
- package/lib/service.js.map +1 -1
- package/lib/session.d.ts +20 -6
- package/lib/session.js +59 -11
- package/lib/session.js.map +1 -1
- package/lib/sidebar.js +1 -1
- package/lib/sources.d.ts +2 -2
- package/lib/sources.js +32 -17
- package/lib/sources.js.map +1 -1
- package/lib/tokens.d.ts +57 -13
- package/lib/tokens.js.map +1 -1
- package/package.json +38 -46
- package/src/config.ts +78 -0
- package/src/debugger.ts +154 -0
- package/src/dialogs/evaluate.ts +144 -0
- package/src/factory.ts +72 -0
- package/src/handler.ts +528 -0
- package/src/handlers/console.ts +118 -0
- package/src/handlers/editor.ts +469 -0
- package/src/handlers/file.ts +86 -0
- package/src/handlers/notebook.ts +128 -0
- package/src/hash.ts +69 -0
- package/src/icons.ts +64 -0
- package/src/index.ts +16 -0
- package/src/model.ts +155 -0
- package/src/panels/breakpoints/body.tsx +145 -0
- package/src/panels/breakpoints/index.ts +116 -0
- package/src/panels/breakpoints/model.ts +74 -0
- package/src/panels/breakpoints/pauseonexceptions.tsx +141 -0
- package/src/panels/callstack/body.tsx +96 -0
- package/src/panels/callstack/index.ts +152 -0
- package/src/panels/callstack/model.ts +86 -0
- package/src/panels/kernelSources/body.tsx +139 -0
- package/src/panels/kernelSources/filter.tsx +44 -0
- package/src/panels/kernelSources/index.tsx +106 -0
- package/src/panels/kernelSources/model.ts +160 -0
- package/src/panels/sources/body.ts +161 -0
- package/src/panels/sources/index.tsx +85 -0
- package/src/panels/sources/model.ts +94 -0
- package/src/panels/sources/sourcepath.tsx +31 -0
- package/src/panels/variables/grid.ts +145 -0
- package/src/panels/variables/gridpanel.ts +453 -0
- package/src/panels/variables/index.ts +199 -0
- package/src/panels/variables/mimerenderer.ts +125 -0
- package/src/panels/variables/model.ts +61 -0
- package/src/panels/variables/scope.tsx +132 -0
- package/src/panels/variables/tree.tsx +521 -0
- package/src/service.ts +1009 -0
- package/src/session.ts +342 -0
- package/src/sidebar.ts +194 -0
- package/src/sources.ts +327 -0
- package/src/svg.d.ts +9 -0
- package/src/tokens.ts +1071 -0
- package/style/breakpoints.css +21 -12
- package/style/callstack.css +2 -2
- package/style/icons/exceptions.svg +10 -0
- package/style/index.css +1 -1
- package/style/index.js +1 -1
- package/style/kernelSources.css +3 -9
- package/style/sources.css +1 -1
- package/style/variables.css +68 -21
package/lib/debugger.d.ts
CHANGED
|
@@ -83,7 +83,8 @@ export declare namespace Debugger {
|
|
|
83
83
|
const renderMimeVariable = "debugger:render-mime-variable";
|
|
84
84
|
const evaluate = "debugger:evaluate";
|
|
85
85
|
const restartDebug = "debugger:restart-debug";
|
|
86
|
-
const
|
|
86
|
+
const pauseOnExceptions = "debugger:pause-on-exceptions";
|
|
87
|
+
const copyToClipboard = "debugger:copy-to-clipboard";
|
|
87
88
|
}
|
|
88
89
|
/**
|
|
89
90
|
* The debugger user interface icons.
|
|
@@ -92,6 +93,7 @@ export declare namespace Debugger {
|
|
|
92
93
|
const closeAllIcon: import("@jupyterlab/ui-components").LabIcon;
|
|
93
94
|
const evaluateIcon: import("@jupyterlab/ui-components").LabIcon;
|
|
94
95
|
const continueIcon: import("@jupyterlab/ui-components").LabIcon;
|
|
96
|
+
const pauseIcon: import("@jupyterlab/ui-components").LabIcon;
|
|
95
97
|
const stepIntoIcon: import("@jupyterlab/ui-components").LabIcon;
|
|
96
98
|
const stepOutIcon: import("@jupyterlab/ui-components").LabIcon;
|
|
97
99
|
const stepOverIcon: import("@jupyterlab/ui-components").LabIcon;
|
package/lib/debugger.js
CHANGED
|
@@ -6,7 +6,7 @@ import { DebuggerEvaluateDialog } from './dialogs/evaluate';
|
|
|
6
6
|
import { ReadOnlyEditorFactory as EditorFactory } from './factory';
|
|
7
7
|
import { DebuggerHandler } from './handler';
|
|
8
8
|
import { EditorHandler as DebuggerEditorHandler } from './handlers/editor';
|
|
9
|
-
import { closeAllIcon as closeAll,
|
|
9
|
+
import { closeAllIcon as closeAll, pauseIcon as pause, stepIntoIcon as stepInto, stepOutIcon as stepOut, stepOverIcon as stepOver, variableIcon as variable, viewBreakpointIcon as viewBreakpoint } from './icons';
|
|
10
10
|
import { DebuggerModel } from './model';
|
|
11
11
|
import { VariablesBodyGrid } from './panels/variables/grid';
|
|
12
12
|
import { VariableMimeRenderer } from './panels/variables/mimerenderer';
|
|
@@ -100,7 +100,8 @@ export var Debugger;
|
|
|
100
100
|
CommandIDs.renderMimeVariable = 'debugger:render-mime-variable';
|
|
101
101
|
CommandIDs.evaluate = 'debugger:evaluate';
|
|
102
102
|
CommandIDs.restartDebug = 'debugger:restart-debug';
|
|
103
|
-
CommandIDs.
|
|
103
|
+
CommandIDs.pauseOnExceptions = 'debugger:pause-on-exceptions';
|
|
104
|
+
CommandIDs.copyToClipboard = 'debugger:copy-to-clipboard';
|
|
104
105
|
})(CommandIDs = Debugger.CommandIDs || (Debugger.CommandIDs = {}));
|
|
105
106
|
/**
|
|
106
107
|
* The debugger user interface icons.
|
|
@@ -110,13 +111,14 @@ export var Debugger;
|
|
|
110
111
|
Icons.closeAllIcon = closeAll;
|
|
111
112
|
Icons.evaluateIcon = codeIcon;
|
|
112
113
|
Icons.continueIcon = runIcon;
|
|
114
|
+
Icons.pauseIcon = pause;
|
|
113
115
|
Icons.stepIntoIcon = stepInto;
|
|
114
116
|
Icons.stepOutIcon = stepOut;
|
|
115
117
|
Icons.stepOverIcon = stepOver;
|
|
116
118
|
Icons.terminateIcon = stopIcon;
|
|
117
119
|
Icons.variableIcon = variable;
|
|
118
120
|
Icons.viewBreakpointIcon = viewBreakpoint;
|
|
119
|
-
Icons.pauseOnExceptionsIcon =
|
|
121
|
+
Icons.pauseOnExceptionsIcon = pause;
|
|
120
122
|
})(Icons = Debugger.Icons || (Debugger.Icons = {}));
|
|
121
123
|
/**
|
|
122
124
|
* The debugger dialog helpers.
|
package/lib/debugger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debugger.js","sourceRoot":"","sources":["../src/debugger.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAE,qBAAqB,IAAI,aAAa,EAAE,MAAM,WAAW,CAAC;AAEnE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,EAAE,aAAa,IAAI,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE3E,OAAO,EACL,YAAY,IAAI,QAAQ,EACxB,
|
|
1
|
+
{"version":3,"file":"debugger.js","sourceRoot":"","sources":["../src/debugger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Dialog } from '@jupyterlab/apputils';
|
|
2
|
+
import { Cell } from '@jupyterlab/cells';
|
|
2
3
|
import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
|
|
3
4
|
/**
|
|
4
5
|
* A namespace for DebuggerEvaluateDialog statics.
|
|
@@ -12,6 +13,10 @@ export declare namespace DebuggerEvaluateDialog {
|
|
|
12
13
|
* The top level text for the dialog. Defaults to an empty string.
|
|
13
14
|
*/
|
|
14
15
|
title: string;
|
|
16
|
+
/**
|
|
17
|
+
* Cell content factory.
|
|
18
|
+
*/
|
|
19
|
+
contentFactory: Cell.IContentFactory;
|
|
15
20
|
/**
|
|
16
21
|
* The mime renderer for the cell widget.
|
|
17
22
|
*/
|
package/lib/dialogs/evaluate.js
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Jupyter Development Team.
|
|
3
|
+
* Distributed under the terms of the Modified BSD License.
|
|
4
|
+
*/
|
|
1
5
|
import { Dialog } from '@jupyterlab/apputils';
|
|
2
6
|
import { CodeCell, CodeCellModel } from '@jupyterlab/cells';
|
|
3
7
|
import { Widget } from '@lumino/widgets';
|
|
@@ -14,10 +18,14 @@ export var DebuggerEvaluateDialog;
|
|
|
14
18
|
* @returns A promise that resolves with whether the dialog was accepted
|
|
15
19
|
*/
|
|
16
20
|
function getCode(options) {
|
|
17
|
-
const dialog = new EvaluateDialog(
|
|
21
|
+
const dialog = new EvaluateDialog({
|
|
22
|
+
...options,
|
|
23
|
+
body: new EvaluateDialogBody(options),
|
|
24
|
+
buttons: [
|
|
18
25
|
Dialog.cancelButton({ label: options.cancelLabel }),
|
|
19
26
|
Dialog.okButton({ label: options.okLabel })
|
|
20
|
-
]
|
|
27
|
+
]
|
|
28
|
+
});
|
|
21
29
|
return dialog.launch();
|
|
22
30
|
}
|
|
23
31
|
DebuggerEvaluateDialog.getCode = getCode;
|
|
@@ -56,12 +64,14 @@ class EvaluateDialogBody extends Widget {
|
|
|
56
64
|
*/
|
|
57
65
|
constructor(options) {
|
|
58
66
|
super();
|
|
59
|
-
const { rendermime, mimeType } = options;
|
|
60
|
-
const model = new CodeCellModel(
|
|
67
|
+
const { contentFactory, rendermime, mimeType } = options;
|
|
68
|
+
const model = new CodeCellModel();
|
|
61
69
|
model.mimeType = mimeType !== null && mimeType !== void 0 ? mimeType : '';
|
|
62
70
|
this._prompt = new CodeCell({
|
|
71
|
+
contentFactory,
|
|
63
72
|
rendermime,
|
|
64
|
-
model
|
|
73
|
+
model,
|
|
74
|
+
placeholder: false
|
|
65
75
|
}).initializeState();
|
|
66
76
|
// explicitly remove the prompt in front of the input area
|
|
67
77
|
this._prompt.inputArea.promptNode.remove();
|
|
@@ -71,7 +81,7 @@ class EvaluateDialogBody extends Widget {
|
|
|
71
81
|
* Get the text specified by the user
|
|
72
82
|
*/
|
|
73
83
|
getValue() {
|
|
74
|
-
return this._prompt.model.
|
|
84
|
+
return this._prompt.model.sharedModel.getSource();
|
|
75
85
|
}
|
|
76
86
|
/**
|
|
77
87
|
* A message handler invoked on an `'after-attach'` message.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/dialogs/evaluate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,
|
|
1
|
+
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/dialogs/evaluate.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,EAAQ,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAMlE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC;;GAEG;AACH,MAAM,KAAW,sBAAsB,CAsDtC;AAtDD,WAAiB,sBAAsB;IAoCrC;;;;;;OAMG;IACH,SAAgB,OAAO,CAAC,OAAiB;QACvC,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC;YAChC,GAAG,OAAO;YACV,IAAI,EAAE,IAAI,kBAAkB,CAAC,OAAO,CAAC;YACrC,OAAO,EAAE;gBACP,MAAM,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC;gBACnD,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;aAC5C;SACF,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;IAVe,8BAAO,UAUtB,CAAA;AACH,CAAC,EAtDgB,sBAAsB,KAAtB,sBAAsB,QAsDtC;AAED;;GAEG;AACH,MAAM,cAAe,SAAQ,MAAc;IACzC;;;;OAIG;IACH,WAAW,CAAC,KAAY;QACtB,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;YAC5B,MAAM,aAAa,GAAG,KAAsB,CAAC;YAC7C,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;YACzC,IAAI,QAAQ,IAAI,IAAI,KAAK,OAAO,EAAE;gBAChC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;aACvB;YACD,IAAI,IAAI,KAAK,OAAO,EAAE;gBACpB,OAAO;aACR;SACF;QACD,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;CACF;AAED;;GAEG;AACH,MAAM,kBAAmB,SAAQ,MAAM;IACrC;;;;OAIG;IACH,YAAY,OAAwC;QAClD,KAAK,EAAE,CAAC;QAER,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAEzD,MAAM,KAAK,GAAG,IAAI,aAAa,EAAE,CAAC;QAClC,KAAK,CAAC,QAAQ,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,IAAI,QAAQ,CAAC;YAC1B,cAAc;YACd,UAAU;YACV,KAAK;YACL,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC,eAAe,EAAE,CAAC;QAErB,0DAA0D;QAC1D,IAAI,CAAC,OAAO,CAAC,SAAU,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QAE5C,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;IACpD,CAAC;IAED;;OAEG;IACO,aAAa,CAAC,GAAY;QAClC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC1B,CAAC;CAGF"}
|
package/lib/factory.d.ts
CHANGED
package/lib/factory.js
CHANGED
|
@@ -22,18 +22,24 @@ export class ReadOnlyEditorFactory {
|
|
|
22
22
|
const { content, mimeType, path } = source;
|
|
23
23
|
const factory = this._services.factoryService.newInlineEditor;
|
|
24
24
|
const mimeTypeService = this._services.mimeTypeService;
|
|
25
|
+
const model = new CodeEditor.Model({
|
|
26
|
+
mimeType: mimeType || mimeTypeService.getMimeTypeByFilePath(path)
|
|
27
|
+
});
|
|
28
|
+
model.sharedModel.source = content;
|
|
25
29
|
const editor = new CodeEditorWrapper({
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
}
|
|
30
|
+
editorOptions: {
|
|
31
|
+
config: {
|
|
32
|
+
readOnly: true,
|
|
33
|
+
lineNumbers: true
|
|
34
|
+
}
|
|
35
|
+
},
|
|
36
|
+
model,
|
|
37
|
+
factory
|
|
35
38
|
});
|
|
36
39
|
editor.node.setAttribute('data-jp-debugger', 'true');
|
|
40
|
+
editor.disposed.connect(() => {
|
|
41
|
+
model.dispose();
|
|
42
|
+
});
|
|
37
43
|
return editor;
|
|
38
44
|
}
|
|
39
45
|
}
|
package/lib/factory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EACL,UAAU,EACV,iBAAiB,EAElB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EACL,UAAU,EACV,iBAAiB,EAElB,MAAM,wBAAwB,CAAC;AAGhC;;GAEG;AACH,MAAM,OAAO,qBAAqB;IAChC;;;;OAIG;IACH,YAAY,OAAuC;QACjD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACH,eAAe,CAAC,MAAwB;QACtC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,eAAe,CAAC;QAC9D,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC;QACvD,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC;YACjC,QAAQ,EAAE,QAAQ,IAAI,eAAe,CAAC,qBAAqB,CAAC,IAAI,CAAC;SAClE,CAAC,CAAC;QACH,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,OAAO,CAAC;QACnC,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC;YACnC,aAAa,EAAE;gBACb,MAAM,EAAE;oBACN,QAAQ,EAAE,IAAI;oBACd,WAAW,EAAE,IAAI;iBAClB;aACF;YACD,KAAK;YACL,OAAO;SACR,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;QAErD,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE;YAC3B,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;CAGF"}
|
package/lib/handler.js
CHANGED
|
@@ -99,7 +99,6 @@ export class DebuggerHandler {
|
|
|
99
99
|
this._kernelChangedHandlers[widget.id] = kernelChanged;
|
|
100
100
|
connection.kernelChanged.connect(kernelChanged);
|
|
101
101
|
const statusChanged = (_, status) => {
|
|
102
|
-
// FIXME-TRANS: Localizable?
|
|
103
102
|
if (status.endsWith('restarting')) {
|
|
104
103
|
void this.updateWidget(widget, connection);
|
|
105
104
|
}
|
|
@@ -111,9 +110,8 @@ export class DebuggerHandler {
|
|
|
111
110
|
connection.statusChanged.connect(statusChanged);
|
|
112
111
|
this._statusChangedHandlers[widget.id] = statusChanged;
|
|
113
112
|
const iopubMessage = (_, msg) => {
|
|
114
|
-
if (msg.parent_header
|
|
115
|
-
|
|
116
|
-
'execute_request' &&
|
|
113
|
+
if (msg.parent_header.msg_type ==
|
|
114
|
+
'execute_request' &&
|
|
117
115
|
this._service.isStarted &&
|
|
118
116
|
!this._service.hasStoppedThreads()) {
|
|
119
117
|
void this._service.displayDefinedVariables();
|
|
@@ -265,6 +263,15 @@ export class DebuggerHandler {
|
|
|
265
263
|
}
|
|
266
264
|
};
|
|
267
265
|
addToolbarButton(false);
|
|
266
|
+
// listen to the disposed signals
|
|
267
|
+
widget.disposed.connect(async () => {
|
|
268
|
+
if (isDebuggerOn()) {
|
|
269
|
+
await stopDebugger();
|
|
270
|
+
}
|
|
271
|
+
removeHandlers();
|
|
272
|
+
delete this._iconButtons[widget.id];
|
|
273
|
+
delete this._contextKernelChangedHandlers[widget.id];
|
|
274
|
+
});
|
|
268
275
|
const debuggingEnabled = await this._service.isAvailable(connection);
|
|
269
276
|
if (!debuggingEnabled) {
|
|
270
277
|
removeHandlers();
|
|
@@ -273,7 +280,10 @@ export class DebuggerHandler {
|
|
|
273
280
|
}
|
|
274
281
|
// update the active debug session
|
|
275
282
|
if (!this._service.session) {
|
|
276
|
-
this._service.session = new Debugger.Session({
|
|
283
|
+
this._service.session = new Debugger.Session({
|
|
284
|
+
connection,
|
|
285
|
+
config: this._service.config
|
|
286
|
+
});
|
|
277
287
|
}
|
|
278
288
|
else {
|
|
279
289
|
this._previousConnection = ((_a = this._service.session.connection) === null || _a === void 0 ? void 0 : _a.kernel)
|
|
@@ -299,8 +309,6 @@ export class DebuggerHandler {
|
|
|
299
309
|
// if the debugger is started but there is no handler, create a new one
|
|
300
310
|
createHandler();
|
|
301
311
|
this._previousConnection = connection;
|
|
302
|
-
// listen to the disposed signals
|
|
303
|
-
widget.disposed.connect(removeHandlers);
|
|
304
312
|
}
|
|
305
313
|
}
|
|
306
314
|
//# sourceMappingURL=handler.js.map
|
package/lib/handler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAU3D,OAAO,EAAe,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,MAAM,qBAAqB,GAAG,eAAe,CAAC;AAE9C;;;;;GAKG;AACH,SAAS,gBAAgB,CACvB,MAAkE,EAClE,OAAmB,EACnB,OAAiB,EACjB,OAAiB,EACjB,aAA0B,cAAc;IAExC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,IAAI,aAAa,CAAC;QAC7B,SAAS,EAAE,sBAAsB;QACjC,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC;QACpC,WAAW,EAAE,UAAU;QACvB,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAAC;QAC5C,eAAe,EAAE,KAAK,CAAC,EAAE,CACvB,4DAA4D,CAC7D;QACD,OAAO;QACP,OAAO;QACP,OAAO;KACR,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,qBAAqB,EAAE,IAAI,CAAC,EAAE;QAC3E,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;KACrD;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,qBAAqB,CAC5B,MAAqB,EACrB,OAAgB,EAChB,UAAmB,IAAI,EACvB,OAAoB;IAEpB,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,IAAI,OAAO,EAAE;YACX,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;SAC1B;KACF;AACH,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,eAAe;IAC1B;;;;OAIG;IACH,YAAY,OAAiC;
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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"}
|
package/lib/handlers/console.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// Copyright (c) Jupyter Development Team.
|
|
2
2
|
// Distributed under the terms of the Modified BSD License.
|
|
3
3
|
import { ObservableMap } from '@jupyterlab/observables';
|
|
4
|
-
import { each } from '@lumino/algorithm';
|
|
5
4
|
import { Signal } from '@lumino/signaling';
|
|
6
5
|
import { EditorHandler } from '../handlers/editor';
|
|
7
6
|
/**
|
|
@@ -25,7 +24,9 @@ export class ConsoleHandler {
|
|
|
25
24
|
this._addEditorHandler(cell);
|
|
26
25
|
});
|
|
27
26
|
const addHandlers = () => {
|
|
28
|
-
|
|
27
|
+
for (const cell of codeConsole.cells) {
|
|
28
|
+
this._addEditorHandler(cell);
|
|
29
|
+
}
|
|
29
30
|
};
|
|
30
31
|
addHandlers();
|
|
31
32
|
this._consolePanel.console.cells.changed.connect(addHandlers);
|
|
@@ -55,7 +56,12 @@ export class ConsoleHandler {
|
|
|
55
56
|
const codeCell = cell;
|
|
56
57
|
const editorHandler = new EditorHandler({
|
|
57
58
|
debuggerService: this._debuggerService,
|
|
58
|
-
|
|
59
|
+
editorReady: async () => {
|
|
60
|
+
await codeCell.ready;
|
|
61
|
+
return codeCell.editor;
|
|
62
|
+
},
|
|
63
|
+
getEditor: () => codeCell.editor,
|
|
64
|
+
src: cell.model.sharedModel
|
|
59
65
|
});
|
|
60
66
|
codeCell.disposed.connect(() => {
|
|
61
67
|
this._cellMap.delete(modelId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../src/handlers/console.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAM3D,OAAO,EAAkB,aAAa,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../src/handlers/console.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAM3D,OAAO,EAAkB,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAIxE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD;;GAEG;AACH,MAAM,OAAO,cAAc;IACzB;;;;OAIG;IACH,YAAY,OAAgC;QAC1C,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC;QAChD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAiB,CAAC;QAEnD,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;QAE/C,IAAI,WAAW,CAAC,UAAU,EAAE;YAC1B,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;SAChD;QACD,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAc,EAAE,IAAc,EAAE,EAAE;YACvE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,GAAS,EAAE;YAC7B,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,KAAK,EAAE;gBACpC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;aAC9B;QACH,CAAC,CAAC;QACF,WAAW,EAAE,CAAC;QACd,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAOD;;OAEG;IACH,OAAO;QACL,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,OAAO;SACR;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACK,iBAAiB,CAAC,IAAU;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC5D,OAAO;SACR;QACD,MAAM,QAAQ,GAAG,IAAgB,CAAC;QAClC,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC;YACtC,eAAe,EAAE,IAAI,CAAC,gBAAgB;YACtC,WAAW,EAAE,KAAK,IAAI,EAAE;gBACtB,MAAM,QAAQ,CAAC,KAAK,CAAC;gBACrB,OAAO,QAAQ,CAAC,MAAO,CAAC;YAC1B,CAAC;YACD,SAAS,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM;YAChC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW;SAC5B,CAAC,CAAC;QACH,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE;YAC7B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9B,aAAa,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC5C,CAAC;CAKF"}
|
package/lib/handlers/editor.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { CodeEditor } from '@jupyterlab/codeeditor';
|
|
2
2
|
import { IDisposable } from '@lumino/disposable';
|
|
3
|
+
import { ISharedText } from '@jupyter/ydoc';
|
|
4
|
+
import { StateEffectType } from '@codemirror/state';
|
|
3
5
|
import { IDebugger } from '../tokens';
|
|
4
6
|
/**
|
|
5
7
|
* A handler for a CodeEditor.IEditor.
|
|
@@ -14,7 +16,7 @@ export declare class EditorHandler implements IDisposable {
|
|
|
14
16
|
/**
|
|
15
17
|
* The editor
|
|
16
18
|
*/
|
|
17
|
-
get editor(): CodeEditor.IEditor;
|
|
19
|
+
get editor(): CodeEditor.IEditor | null;
|
|
18
20
|
/**
|
|
19
21
|
* Whether the handler is disposed.
|
|
20
22
|
*/
|
|
@@ -43,7 +45,7 @@ export declare class EditorHandler implements IDisposable {
|
|
|
43
45
|
* Handle a click on the gutter.
|
|
44
46
|
*
|
|
45
47
|
* @param editor The editor from where the click originated.
|
|
46
|
-
* @param
|
|
48
|
+
* @param position The position corresponding to the click event.
|
|
47
49
|
*/
|
|
48
50
|
private _onGutterClick;
|
|
49
51
|
/**
|
|
@@ -54,16 +56,23 @@ export declare class EditorHandler implements IDisposable {
|
|
|
54
56
|
* Retrieve the breakpoints from the editor.
|
|
55
57
|
*/
|
|
56
58
|
private _getBreakpointsFromEditor;
|
|
59
|
+
private _clearGutter;
|
|
57
60
|
/**
|
|
58
61
|
* Get the breakpoints for the editor using its content (code),
|
|
59
62
|
* or its path (if it exists).
|
|
60
63
|
*/
|
|
61
64
|
private _getBreakpoints;
|
|
62
65
|
private _id;
|
|
63
|
-
private _path;
|
|
64
|
-
private _editor;
|
|
65
66
|
private _debuggerService;
|
|
67
|
+
private _editor;
|
|
68
|
+
private _breakpointEffect;
|
|
69
|
+
private _breakpointState;
|
|
70
|
+
private _gutter;
|
|
71
|
+
private _highlightDeco;
|
|
72
|
+
private _highlightState;
|
|
66
73
|
private _editorMonitor;
|
|
74
|
+
private _path;
|
|
75
|
+
private _src;
|
|
67
76
|
}
|
|
68
77
|
/**
|
|
69
78
|
* A namespace for EditorHandler `statics`.
|
|
@@ -78,14 +87,25 @@ export declare namespace EditorHandler {
|
|
|
78
87
|
*/
|
|
79
88
|
debuggerService: IDebugger;
|
|
80
89
|
/**
|
|
81
|
-
*
|
|
90
|
+
* Promise resolving when the editor is ready.
|
|
91
|
+
*/
|
|
92
|
+
editorReady(): Promise<CodeEditor.IEditor>;
|
|
93
|
+
/**
|
|
94
|
+
* Get the code editor to handle.
|
|
82
95
|
*/
|
|
83
|
-
|
|
96
|
+
getEditor(): CodeEditor.IEditor | null;
|
|
84
97
|
/**
|
|
85
98
|
* An optional path to a source file.
|
|
86
99
|
*/
|
|
87
100
|
path?: string;
|
|
101
|
+
/**
|
|
102
|
+
* The code source to debug
|
|
103
|
+
*/
|
|
104
|
+
src: ISharedText;
|
|
88
105
|
}
|
|
106
|
+
const _highlightEffect: StateEffectType<{
|
|
107
|
+
pos: number[];
|
|
108
|
+
}>;
|
|
89
109
|
/**
|
|
90
110
|
* Highlight the current line of the frame in the given editor.
|
|
91
111
|
*
|
|
@@ -99,10 +119,4 @@ export declare namespace EditorHandler {
|
|
|
99
119
|
* @param editor The editor to cleanup.
|
|
100
120
|
*/
|
|
101
121
|
function clearHighlight(editor: CodeEditor.IEditor): void;
|
|
102
|
-
/**
|
|
103
|
-
* Remove line numbers and all gutters from editor.
|
|
104
|
-
*
|
|
105
|
-
* @param editor The editor to cleanup.
|
|
106
|
-
*/
|
|
107
|
-
function clearGutter(editor: CodeEditor.IEditor): void;
|
|
108
122
|
}
|