@jupyterlab/debugger 4.5.0-beta.0 → 4.5.0-rc.0
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/displayregistry.d.ts +31 -0
- package/lib/displayregistry.js +39 -0
- package/lib/displayregistry.js.map +1 -0
- package/lib/handler.d.ts +11 -0
- package/lib/handler.js +13 -4
- package/lib/handler.js.map +1 -1
- package/lib/handlers/console.d.ts +7 -0
- package/lib/handlers/console.js +32 -0
- package/lib/handlers/console.js.map +1 -1
- package/lib/handlers/file.d.ts +7 -0
- package/lib/handlers/file.js +30 -1
- package/lib/handlers/file.js.map +1 -1
- package/lib/handlers/notebook.d.ts +7 -0
- package/lib/handlers/notebook.js +30 -0
- package/lib/handlers/notebook.js.map +1 -1
- package/lib/handlers/pausedoverlay.d.ts +37 -0
- package/lib/handlers/pausedoverlay.js +80 -0
- package/lib/handlers/pausedoverlay.js.map +1 -0
- package/lib/index.d.ts +2 -1
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/model.d.ts +16 -1
- package/lib/model.js +10 -4
- package/lib/model.js.map +1 -1
- package/lib/panels/breakpoints/body.d.ts +0 -3
- package/lib/panels/breakpoints/body.js +8 -12
- package/lib/panels/breakpoints/body.js.map +1 -1
- package/lib/panels/breakpoints/model.d.ts +24 -1
- package/lib/panels/breakpoints/model.js +12 -1
- package/lib/panels/breakpoints/model.js.map +1 -1
- package/lib/panels/callstack/body.js +3 -11
- package/lib/panels/callstack/body.js.map +1 -1
- package/lib/panels/callstack/model.d.ts +33 -1
- package/lib/panels/callstack/model.js +15 -1
- package/lib/panels/callstack/model.js.map +1 -1
- package/lib/panels/sources/body.js +7 -6
- package/lib/panels/sources/body.js.map +1 -1
- package/lib/panels/sources/model.d.ts +15 -1
- package/lib/panels/sources/model.js +19 -0
- package/lib/panels/sources/model.js.map +1 -1
- package/lib/service.d.ts +11 -0
- package/lib/service.js +35 -13
- package/lib/service.js.map +1 -1
- package/lib/sidebar.d.ts +1 -1
- package/lib/tokens.d.ts +39 -1
- package/lib/tokens.js +4 -0
- package/lib/tokens.js.map +1 -1
- package/package.json +18 -17
- package/src/displayregistry.ts +59 -0
- package/src/handler.ts +26 -4
- package/src/handlers/console.ts +43 -0
- package/src/handlers/file.ts +41 -0
- package/src/handlers/notebook.ts +40 -0
- package/src/handlers/pausedoverlay.ts +112 -0
- package/src/index.ts +4 -1
- package/src/model.ts +27 -4
- package/src/panels/breakpoints/body.tsx +9 -12
- package/src/panels/breakpoints/index.ts +1 -0
- package/src/panels/breakpoints/model.ts +33 -2
- package/src/panels/callstack/body.tsx +2 -10
- package/src/panels/callstack/model.ts +49 -2
- package/src/panels/sources/body.ts +7 -5
- package/src/panels/sources/model.ts +28 -1
- package/src/service.ts +57 -11
- package/src/sidebar.ts +1 -1
- package/src/tokens.ts +49 -1
- package/style/base.css +36 -1
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { IDebugger, IDebuggerDisplayRegistry } from './tokens';
|
|
2
|
+
/**
|
|
3
|
+
* Interface for display providers that can format debugger source paths.
|
|
4
|
+
*/
|
|
5
|
+
export interface IDebuggerSourceDisplayProvider {
|
|
6
|
+
/**
|
|
7
|
+
* Whether this provider can handle the given debugger source.
|
|
8
|
+
*/
|
|
9
|
+
canHandle(source: IDebugger.Source): boolean;
|
|
10
|
+
/**
|
|
11
|
+
* Return a user-facing display name for the given source.
|
|
12
|
+
*/
|
|
13
|
+
getDisplayName(source: IDebugger.Source): string;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Registry that holds display providers for different source types.
|
|
17
|
+
*/
|
|
18
|
+
export declare class DebuggerDisplayRegistry implements IDebuggerDisplayRegistry {
|
|
19
|
+
/**
|
|
20
|
+
* Register a display provider.
|
|
21
|
+
*
|
|
22
|
+
* @param provider source display providder to register.
|
|
23
|
+
*/
|
|
24
|
+
register(provider: IDebuggerSourceDisplayProvider): void;
|
|
25
|
+
/**
|
|
26
|
+
* Try all providers. If any returns something more meaningful than `source.path`,
|
|
27
|
+
* use that. Otherwise, fall back to `source.path`.
|
|
28
|
+
*/
|
|
29
|
+
getDisplayName(source: IDebugger.Source): string;
|
|
30
|
+
private _providers;
|
|
31
|
+
}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
// Copyright (c) Jupyter Development Team.
|
|
2
|
+
// Distributed under the terms of the Modified BSD License.
|
|
3
|
+
/**
|
|
4
|
+
* Registry that holds display providers for different source types.
|
|
5
|
+
*/
|
|
6
|
+
export class DebuggerDisplayRegistry {
|
|
7
|
+
constructor() {
|
|
8
|
+
this._providers = [];
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* Register a display provider.
|
|
12
|
+
*
|
|
13
|
+
* @param provider source display providder to register.
|
|
14
|
+
*/
|
|
15
|
+
register(provider) {
|
|
16
|
+
this._providers.push(provider);
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Try all providers. If any returns something more meaningful than `source.path`,
|
|
20
|
+
* use that. Otherwise, fall back to `source.path`.
|
|
21
|
+
*/
|
|
22
|
+
getDisplayName(source) {
|
|
23
|
+
var _a;
|
|
24
|
+
const path = (_a = source.path) !== null && _a !== void 0 ? _a : '';
|
|
25
|
+
let index = path;
|
|
26
|
+
for (const provider of this._providers) {
|
|
27
|
+
if (!provider.canHandle(source)) {
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
const name = provider.getDisplayName(source);
|
|
31
|
+
// If provider returns something different or more descriptive than raw path
|
|
32
|
+
if (name && name !== path) {
|
|
33
|
+
index = name;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return index;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=displayregistry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"displayregistry.js","sourceRoot":"","sources":["../src/displayregistry.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAmB3D;;GAEG;AACH,MAAM,OAAO,uBAAuB;IAApC;QAkCU,eAAU,GAAqC,EAAE,CAAC;IAC5D,CAAC;IAlCC;;;;OAIG;IACH,QAAQ,CAAC,QAAwC;QAC/C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,cAAc,CAAC,MAAwB;;QACrC,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE,CAAC;QAC/B,IAAI,KAAK,GAAG,IAAI,CAAC;QAEjB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACvC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;gBAChC,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAE7C,4EAA4E;YAC5E,IAAI,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAC1B,KAAK,GAAG,IAAI,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CAGF"}
|
package/lib/handler.d.ts
CHANGED
|
@@ -4,10 +4,12 @@ import { ConsolePanel } from '@jupyterlab/console';
|
|
|
4
4
|
import { DocumentWidget } from '@jupyterlab/docregistry';
|
|
5
5
|
import { NotebookPanel } from '@jupyterlab/notebook';
|
|
6
6
|
import { Session } from '@jupyterlab/services';
|
|
7
|
+
import { ITranslator } from '@jupyterlab/translation';
|
|
7
8
|
import { ConsoleHandler } from './handlers/console';
|
|
8
9
|
import { FileHandler } from './handlers/file';
|
|
9
10
|
import { NotebookHandler } from './handlers/notebook';
|
|
10
11
|
import { IDebugger } from './tokens';
|
|
12
|
+
import { ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
11
13
|
/**
|
|
12
14
|
* A handler for debugging a widget.
|
|
13
15
|
*/
|
|
@@ -51,6 +53,7 @@ export declare class DebuggerHandler implements DebuggerHandler.IHandler {
|
|
|
51
53
|
private _previousConnection;
|
|
52
54
|
private _activeWidget;
|
|
53
55
|
private _handlers;
|
|
56
|
+
private _translator;
|
|
54
57
|
private _contextKernelChangedHandlers;
|
|
55
58
|
private _kernelChangedHandlers;
|
|
56
59
|
private _statusChangedHandlers;
|
|
@@ -77,6 +80,14 @@ export declare namespace DebuggerHandler {
|
|
|
77
80
|
* The debugger service.
|
|
78
81
|
*/
|
|
79
82
|
service: IDebugger;
|
|
83
|
+
/**
|
|
84
|
+
* The debugger settings.
|
|
85
|
+
*/
|
|
86
|
+
settings?: ISettingRegistry.ISettings;
|
|
87
|
+
/**
|
|
88
|
+
* The application language translator.
|
|
89
|
+
*/
|
|
90
|
+
translator?: ITranslator;
|
|
80
91
|
}
|
|
81
92
|
/**
|
|
82
93
|
* An interface for debugger handler.
|
package/lib/handler.js
CHANGED
|
@@ -68,6 +68,7 @@ export class DebuggerHandler {
|
|
|
68
68
|
this._type = options.type;
|
|
69
69
|
this._shell = options.shell;
|
|
70
70
|
this._service = options.service;
|
|
71
|
+
this._translator = options.translator || nullTranslator;
|
|
71
72
|
}
|
|
72
73
|
/**
|
|
73
74
|
* Get the active widget.
|
|
@@ -175,19 +176,22 @@ export class DebuggerHandler {
|
|
|
175
176
|
case 'notebook':
|
|
176
177
|
this._handlers[widget.id] = new NotebookHandler({
|
|
177
178
|
debuggerService: this._service,
|
|
178
|
-
widget: widget
|
|
179
|
+
widget: widget,
|
|
180
|
+
translator: this._translator || undefined
|
|
179
181
|
});
|
|
180
182
|
break;
|
|
181
183
|
case 'console':
|
|
182
184
|
this._handlers[widget.id] = new ConsoleHandler({
|
|
183
185
|
debuggerService: this._service,
|
|
184
|
-
widget: widget
|
|
186
|
+
widget: widget,
|
|
187
|
+
translator: this._translator || undefined
|
|
185
188
|
});
|
|
186
189
|
break;
|
|
187
190
|
case 'file':
|
|
188
191
|
this._handlers[widget.id] = new FileHandler({
|
|
189
192
|
debuggerService: this._service,
|
|
190
|
-
widget: widget
|
|
193
|
+
widget: widget,
|
|
194
|
+
translator: this._translator || undefined
|
|
191
195
|
});
|
|
192
196
|
break;
|
|
193
197
|
default:
|
|
@@ -291,7 +295,12 @@ export class DebuggerHandler {
|
|
|
291
295
|
: null;
|
|
292
296
|
this._service.session.connection = connection;
|
|
293
297
|
}
|
|
294
|
-
|
|
298
|
+
if (isDebuggerOn()) {
|
|
299
|
+
await this._service.restoreState(true);
|
|
300
|
+
}
|
|
301
|
+
else {
|
|
302
|
+
await this._service.restoreState(false);
|
|
303
|
+
}
|
|
295
304
|
if (this._service.isStarted && !this._service.hasStoppedThreads()) {
|
|
296
305
|
await this._service.displayDefinedVariables();
|
|
297
306
|
if ((_c = (_b = this._service.session) === null || _b === void 0 ? void 0 : _b.capabilities) === null || _c === void 0 ? void 0 : _c.supportsModulesRequest) {
|
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;
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ConsolePanel } from '@jupyterlab/console';
|
|
2
2
|
import { IDisposable } from '@lumino/disposable';
|
|
3
3
|
import { IDebugger } from '../tokens';
|
|
4
|
+
import { ITranslator } from '@jupyterlab/translation';
|
|
4
5
|
/**
|
|
5
6
|
* A handler for consoles.
|
|
6
7
|
*/
|
|
@@ -28,6 +29,8 @@ export declare class ConsoleHandler implements IDisposable {
|
|
|
28
29
|
private _consolePanel;
|
|
29
30
|
private _debuggerService;
|
|
30
31
|
private _cellMap;
|
|
32
|
+
private _pausedOverlay;
|
|
33
|
+
protected translator: ITranslator;
|
|
31
34
|
}
|
|
32
35
|
/**
|
|
33
36
|
* A namespace for ConsoleHandler `statics`.
|
|
@@ -45,5 +48,9 @@ export declare namespace ConsoleHandler {
|
|
|
45
48
|
* The widget to handle.
|
|
46
49
|
*/
|
|
47
50
|
widget: ConsolePanel;
|
|
51
|
+
/**
|
|
52
|
+
* The application language translator.
|
|
53
|
+
*/
|
|
54
|
+
translator?: ITranslator;
|
|
48
55
|
}
|
|
49
56
|
}
|
package/lib/handlers/console.js
CHANGED
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
import { ObservableMap } from '@jupyterlab/observables';
|
|
4
4
|
import { Signal } from '@lumino/signaling';
|
|
5
5
|
import { EditorHandler } from '../handlers/editor';
|
|
6
|
+
import { nullTranslator } from '@jupyterlab/translation';
|
|
7
|
+
import { DebuggerPausedOverlay } from './pausedoverlay';
|
|
6
8
|
/**
|
|
7
9
|
* A handler for consoles.
|
|
8
10
|
*/
|
|
@@ -13,9 +15,16 @@ export class ConsoleHandler {
|
|
|
13
15
|
* @param options The instantiation options for a ConsoleHandler.
|
|
14
16
|
*/
|
|
15
17
|
constructor(options) {
|
|
18
|
+
var _a;
|
|
16
19
|
this._debuggerService = options.debuggerService;
|
|
17
20
|
this._consolePanel = options.widget;
|
|
18
21
|
this._cellMap = new ObservableMap();
|
|
22
|
+
this.translator = options.translator || nullTranslator;
|
|
23
|
+
this._pausedOverlay = new DebuggerPausedOverlay({
|
|
24
|
+
debuggerService: this._debuggerService,
|
|
25
|
+
container: this._consolePanel.node,
|
|
26
|
+
translator: this.translator
|
|
27
|
+
});
|
|
19
28
|
const codeConsole = this._consolePanel.console;
|
|
20
29
|
if (codeConsole.promptCell) {
|
|
21
30
|
this._addEditorHandler(codeConsole.promptCell);
|
|
@@ -30,6 +39,28 @@ export class ConsoleHandler {
|
|
|
30
39
|
};
|
|
31
40
|
addHandlers();
|
|
32
41
|
this._consolePanel.console.cells.changed.connect(addHandlers);
|
|
42
|
+
// Connect debugger events
|
|
43
|
+
(_a = this._debuggerService.session) === null || _a === void 0 ? void 0 : _a.eventMessage.connect((_, event) => {
|
|
44
|
+
var _a, _b, _c;
|
|
45
|
+
const session = this._debuggerService.session;
|
|
46
|
+
const contextSession = this._consolePanel.sessionContext.session;
|
|
47
|
+
if (!session || !contextSession) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
if (((_b = (_a = session.connection) === null || _a === void 0 ? void 0 : _a.kernel) === null || _b === void 0 ? void 0 : _b.id) !== ((_c = contextSession.kernel) === null || _c === void 0 ? void 0 : _c.id)) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
if (event.event === 'stopped') {
|
|
54
|
+
void this._pausedOverlay.show();
|
|
55
|
+
}
|
|
56
|
+
else if (event.event === 'continued') {
|
|
57
|
+
void this._pausedOverlay.hide();
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
// If already paused when initialized
|
|
61
|
+
if (this._debuggerService.hasStoppedThreads()) {
|
|
62
|
+
void this._pausedOverlay.show();
|
|
63
|
+
}
|
|
33
64
|
}
|
|
34
65
|
/**
|
|
35
66
|
* Dispose the handler.
|
|
@@ -39,6 +70,7 @@ export class ConsoleHandler {
|
|
|
39
70
|
return;
|
|
40
71
|
}
|
|
41
72
|
this.isDisposed = true;
|
|
73
|
+
this._pausedOverlay.dispose();
|
|
42
74
|
this._cellMap.values().forEach(handler => handler.dispose());
|
|
43
75
|
this._cellMap.dispose();
|
|
44
76
|
Signal.clearData(this);
|
|
@@ -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;AAIxE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../src/handlers/console.ts"],"names":[],"mappings":"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"}
|
package/lib/handlers/file.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { DocumentWidget } from '@jupyterlab/docregistry';
|
|
|
2
2
|
import { FileEditor } from '@jupyterlab/fileeditor';
|
|
3
3
|
import { IDisposable } from '@lumino/disposable';
|
|
4
4
|
import { IDebugger } from '../tokens';
|
|
5
|
+
import { ITranslator } from '@jupyterlab/translation';
|
|
5
6
|
/**
|
|
6
7
|
* A handler for files.
|
|
7
8
|
*/
|
|
@@ -23,7 +24,9 @@ export declare class FileHandler implements IDisposable {
|
|
|
23
24
|
private _fileEditor;
|
|
24
25
|
private _debuggerService;
|
|
25
26
|
private _editorHandler;
|
|
27
|
+
private _pausedOverlay;
|
|
26
28
|
private _hasLineNumber;
|
|
29
|
+
protected translator: ITranslator;
|
|
27
30
|
}
|
|
28
31
|
/**
|
|
29
32
|
* A namespace for FileHandler `statics`.
|
|
@@ -41,5 +44,9 @@ export declare namespace FileHandler {
|
|
|
41
44
|
* The widget to handle.
|
|
42
45
|
*/
|
|
43
46
|
widget: DocumentWidget<FileEditor>;
|
|
47
|
+
/**
|
|
48
|
+
* The application language translator.
|
|
49
|
+
*/
|
|
50
|
+
translator?: ITranslator;
|
|
44
51
|
}
|
|
45
52
|
}
|
package/lib/handlers/file.js
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
// Distributed under the terms of the Modified BSD License.
|
|
3
3
|
import { Signal } from '@lumino/signaling';
|
|
4
4
|
import { EditorHandler } from '../handlers/editor';
|
|
5
|
+
import { nullTranslator } from '@jupyterlab/translation';
|
|
6
|
+
import { DebuggerPausedOverlay } from './pausedoverlay';
|
|
5
7
|
/**
|
|
6
8
|
* A handler for files.
|
|
7
9
|
*/
|
|
@@ -12,9 +14,10 @@ export class FileHandler {
|
|
|
12
14
|
* @param options The instantiation options for a FileHandler.
|
|
13
15
|
*/
|
|
14
16
|
constructor(options) {
|
|
15
|
-
var _a;
|
|
17
|
+
var _a, _b;
|
|
16
18
|
this._debuggerService = options.debuggerService;
|
|
17
19
|
this._fileEditor = options.widget.content;
|
|
20
|
+
this.translator = options.translator || nullTranslator;
|
|
18
21
|
this._hasLineNumber =
|
|
19
22
|
(_a = this._fileEditor.editor.getOption('lineNumbers')) !== null && _a !== void 0 ? _a : false;
|
|
20
23
|
this._editorHandler = new EditorHandler({
|
|
@@ -23,6 +26,31 @@ export class FileHandler {
|
|
|
23
26
|
getEditor: () => this._fileEditor.editor,
|
|
24
27
|
src: this._fileEditor.model.sharedModel
|
|
25
28
|
});
|
|
29
|
+
this._pausedOverlay = new DebuggerPausedOverlay({
|
|
30
|
+
debuggerService: this._debuggerService,
|
|
31
|
+
container: options.widget.node,
|
|
32
|
+
translator: this.translator
|
|
33
|
+
});
|
|
34
|
+
(_b = this._debuggerService.session) === null || _b === void 0 ? void 0 : _b.eventMessage.connect((_, event) => {
|
|
35
|
+
var _a, _b, _c;
|
|
36
|
+
const session = this._debuggerService.session;
|
|
37
|
+
const contextSession = options.widget.context.sessionContext.session;
|
|
38
|
+
if (!session || !contextSession) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
if (((_b = (_a = session.connection) === null || _a === void 0 ? void 0 : _a.kernel) === null || _b === void 0 ? void 0 : _b.id) !== ((_c = contextSession.kernel) === null || _c === void 0 ? void 0 : _c.id)) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
if (event.event === 'stopped') {
|
|
45
|
+
void this._pausedOverlay.show();
|
|
46
|
+
}
|
|
47
|
+
else if (event.event === 'continued') {
|
|
48
|
+
void this._pausedOverlay.hide();
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
if (this._debuggerService.hasStoppedThreads()) {
|
|
52
|
+
void this._pausedOverlay.show();
|
|
53
|
+
}
|
|
26
54
|
}
|
|
27
55
|
/**
|
|
28
56
|
* Dispose the handler.
|
|
@@ -33,6 +61,7 @@ export class FileHandler {
|
|
|
33
61
|
return;
|
|
34
62
|
}
|
|
35
63
|
this.isDisposed = true;
|
|
64
|
+
this._pausedOverlay.dispose();
|
|
36
65
|
(_a = this._editorHandler) === null || _a === void 0 ? void 0 : _a.dispose();
|
|
37
66
|
// Restore editor options
|
|
38
67
|
(_b = this._editorHandler) === null || _b === void 0 ? void 0 : _b.editor.setOptions({
|
package/lib/handlers/file.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/handlers/file.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAQ3D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/handlers/file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { NotebookPanel } from '@jupyterlab/notebook';
|
|
2
2
|
import { IDisposable } from '@lumino/disposable';
|
|
3
3
|
import { IDebugger } from '../tokens';
|
|
4
|
+
import { ITranslator } from '@jupyterlab/translation';
|
|
4
5
|
/**
|
|
5
6
|
* A handler for notebooks.
|
|
6
7
|
*/
|
|
@@ -32,6 +33,8 @@ export declare class NotebookHandler implements IDisposable {
|
|
|
32
33
|
private _debuggerService;
|
|
33
34
|
private _notebookPanel;
|
|
34
35
|
private _cellMap;
|
|
36
|
+
private _pausedOverlay;
|
|
37
|
+
protected translator: ITranslator;
|
|
35
38
|
}
|
|
36
39
|
/**
|
|
37
40
|
* A namespace for NotebookHandler statics.
|
|
@@ -49,5 +52,9 @@ export declare namespace NotebookHandler {
|
|
|
49
52
|
* The widget to handle.
|
|
50
53
|
*/
|
|
51
54
|
widget: NotebookPanel;
|
|
55
|
+
/**
|
|
56
|
+
* The application language translator.
|
|
57
|
+
*/
|
|
58
|
+
translator?: ITranslator;
|
|
52
59
|
}
|
|
53
60
|
}
|
package/lib/handlers/notebook.js
CHANGED
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
import { ObservableMap } from '@jupyterlab/observables';
|
|
4
4
|
import { Signal } from '@lumino/signaling';
|
|
5
5
|
import { EditorHandler } from './editor';
|
|
6
|
+
import { nullTranslator } from '@jupyterlab/translation';
|
|
7
|
+
import { DebuggerPausedOverlay } from './pausedoverlay';
|
|
6
8
|
/**
|
|
7
9
|
* A handler for notebooks.
|
|
8
10
|
*/
|
|
@@ -13,11 +15,38 @@ export class NotebookHandler {
|
|
|
13
15
|
* @param options The instantiation options for a NotebookHandler.
|
|
14
16
|
*/
|
|
15
17
|
constructor(options) {
|
|
18
|
+
var _a;
|
|
16
19
|
this._debuggerService = options.debuggerService;
|
|
17
20
|
this._notebookPanel = options.widget;
|
|
18
21
|
this._cellMap = new ObservableMap();
|
|
22
|
+
this.translator = options.translator || nullTranslator;
|
|
23
|
+
this._pausedOverlay = new DebuggerPausedOverlay({
|
|
24
|
+
debuggerService: this._debuggerService,
|
|
25
|
+
container: this._notebookPanel.node,
|
|
26
|
+
translator: this.translator
|
|
27
|
+
});
|
|
19
28
|
const notebook = this._notebookPanel.content;
|
|
20
29
|
notebook.model.cells.changed.connect(this._onCellsChanged, this);
|
|
30
|
+
(_a = this._debuggerService.session) === null || _a === void 0 ? void 0 : _a.eventMessage.connect((_, event) => {
|
|
31
|
+
var _a, _b, _c;
|
|
32
|
+
const session = this._debuggerService.session;
|
|
33
|
+
const contextSession = this._notebookPanel.sessionContext.session;
|
|
34
|
+
if (!session || !contextSession) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
if (((_b = (_a = session.connection) === null || _a === void 0 ? void 0 : _a.kernel) === null || _b === void 0 ? void 0 : _b.id) !== ((_c = contextSession.kernel) === null || _c === void 0 ? void 0 : _c.id)) {
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
if (event.event === 'stopped') {
|
|
41
|
+
void this._pausedOverlay.show();
|
|
42
|
+
}
|
|
43
|
+
else if (event.event === 'continued') {
|
|
44
|
+
void this._pausedOverlay.hide();
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
if (this._debuggerService.hasStoppedThreads() === true) {
|
|
48
|
+
void this._pausedOverlay.show();
|
|
49
|
+
}
|
|
21
50
|
this._onCellsChanged();
|
|
22
51
|
}
|
|
23
52
|
/**
|
|
@@ -28,6 +57,7 @@ export class NotebookHandler {
|
|
|
28
57
|
return;
|
|
29
58
|
}
|
|
30
59
|
this.isDisposed = true;
|
|
60
|
+
this._pausedOverlay.dispose();
|
|
31
61
|
this._cellMap.values().forEach(handler => {
|
|
32
62
|
var _a;
|
|
33
63
|
handler.dispose();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook.js","sourceRoot":"","sources":["../../src/handlers/notebook.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAI3D,OAAO,EAGL,aAAa,EACd,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"notebook.js","sourceRoot":"","sources":["../../src/handlers/notebook.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { IDisposable } from '@lumino/disposable';
|
|
2
|
+
import { IDebugger } from '../tokens';
|
|
3
|
+
import { ITranslator } from '@jupyterlab/translation';
|
|
4
|
+
/**
|
|
5
|
+
* A reusable helper to show a "Paused in Debugger" overlay and block interactions.
|
|
6
|
+
*/
|
|
7
|
+
export declare class DebuggerPausedOverlay implements IDisposable {
|
|
8
|
+
constructor(options: DebuggerPausedOverlay.IOptions);
|
|
9
|
+
/**
|
|
10
|
+
* Show the overlay, if enabled by user settings.
|
|
11
|
+
*/
|
|
12
|
+
show(): void;
|
|
13
|
+
/**
|
|
14
|
+
* Hide and unmount the overlay.
|
|
15
|
+
*/
|
|
16
|
+
hide(): void;
|
|
17
|
+
/**
|
|
18
|
+
* Dispose of the overlay completely.
|
|
19
|
+
*/
|
|
20
|
+
dispose(): void;
|
|
21
|
+
/**
|
|
22
|
+
* Whether the overlay has been disposed.
|
|
23
|
+
*/
|
|
24
|
+
get isDisposed(): boolean;
|
|
25
|
+
private _debuggerService;
|
|
26
|
+
private _container;
|
|
27
|
+
private _trans;
|
|
28
|
+
private _overlay;
|
|
29
|
+
private _isDisposed;
|
|
30
|
+
}
|
|
31
|
+
export declare namespace DebuggerPausedOverlay {
|
|
32
|
+
interface IOptions {
|
|
33
|
+
debuggerService: IDebugger;
|
|
34
|
+
container: HTMLElement;
|
|
35
|
+
translator?: ITranslator;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
// Copyright (c) Jupyter Development Team.
|
|
2
|
+
// Distributed under the terms of the Modified BSD License.
|
|
3
|
+
import { nullTranslator } from '@jupyterlab/translation';
|
|
4
|
+
import { runIcon, stepOverIcon } from '@jupyterlab/ui-components';
|
|
5
|
+
/**
|
|
6
|
+
* A reusable helper to show a "Paused in Debugger" overlay and block interactions.
|
|
7
|
+
*/
|
|
8
|
+
export class DebuggerPausedOverlay {
|
|
9
|
+
constructor(options) {
|
|
10
|
+
this._isDisposed = false;
|
|
11
|
+
this._debuggerService = options.debuggerService;
|
|
12
|
+
this._container = options.container;
|
|
13
|
+
this._trans = (options.translator || nullTranslator).load('jupyterlab');
|
|
14
|
+
// Create overlay
|
|
15
|
+
const overlay = document.createElement('div');
|
|
16
|
+
overlay.className = 'jp-DebuggerPausedOverlay';
|
|
17
|
+
const text = document.createElement('span');
|
|
18
|
+
text.textContent = this._trans.__('Paused in Debugger');
|
|
19
|
+
overlay.appendChild(text);
|
|
20
|
+
const continueBtn = document.createElement('button');
|
|
21
|
+
continueBtn.className = 'jp-DebuggerPausedButton';
|
|
22
|
+
continueBtn.title = this._trans.__('Continue');
|
|
23
|
+
runIcon.element({ container: continueBtn, elementPosition: 'center' });
|
|
24
|
+
continueBtn.onclick = () => {
|
|
25
|
+
void this._debuggerService.continue();
|
|
26
|
+
};
|
|
27
|
+
const nextBtn = document.createElement('button');
|
|
28
|
+
nextBtn.className = 'jp-DebuggerPausedButton';
|
|
29
|
+
nextBtn.title = this._trans.__('Next');
|
|
30
|
+
stepOverIcon.element({ container: nextBtn, elementPosition: 'center' });
|
|
31
|
+
nextBtn.onclick = () => {
|
|
32
|
+
void this._debuggerService.next();
|
|
33
|
+
};
|
|
34
|
+
overlay.appendChild(continueBtn);
|
|
35
|
+
overlay.appendChild(nextBtn);
|
|
36
|
+
overlay.style.pointerEvents = 'auto';
|
|
37
|
+
this._overlay = overlay;
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Show the overlay, if enabled by user settings.
|
|
41
|
+
*/
|
|
42
|
+
show() {
|
|
43
|
+
if (this._isDisposed) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
const showOverlay = document.body.dataset.showPausedOverlay !== 'false';
|
|
47
|
+
if (!showOverlay || !this._overlay || this._overlay.isConnected) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
this._container.appendChild(this._overlay);
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* Hide and unmount the overlay.
|
|
54
|
+
*/
|
|
55
|
+
hide() {
|
|
56
|
+
if (this._isDisposed || !this._overlay || !this._overlay.isConnected) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
this._container.style.pointerEvents = '';
|
|
60
|
+
this._overlay.remove();
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Dispose of the overlay completely.
|
|
64
|
+
*/
|
|
65
|
+
dispose() {
|
|
66
|
+
if (this._isDisposed) {
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
this._isDisposed = true;
|
|
70
|
+
this.hide();
|
|
71
|
+
this._overlay = null;
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Whether the overlay has been disposed.
|
|
75
|
+
*/
|
|
76
|
+
get isDisposed() {
|
|
77
|
+
return this._isDisposed;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
//# sourceMappingURL=pausedoverlay.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pausedoverlay.js","sourceRoot":"","sources":["../../src/handlers/pausedoverlay.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -3,4 +3,5 @@
|
|
|
3
3
|
* @module debugger
|
|
4
4
|
*/
|
|
5
5
|
export { Debugger } from './debugger';
|
|
6
|
-
export {
|
|
6
|
+
export { DebuggerDisplayRegistry } from './displayregistry';
|
|
7
|
+
export { IDebugger, IDebuggerConfig, IDebuggerSources, IDebuggerSidebar, IDebuggerHandler, IDebuggerSourceViewer, IDebuggerDisplayRegistry } from './tokens';
|
package/lib/index.js
CHANGED
|
@@ -5,5 +5,6 @@
|
|
|
5
5
|
* @module debugger
|
|
6
6
|
*/
|
|
7
7
|
export { Debugger } from './debugger';
|
|
8
|
-
export {
|
|
8
|
+
export { DebuggerDisplayRegistry } from './displayregistry';
|
|
9
|
+
export { IDebugger, IDebuggerConfig, IDebuggerSources, IDebuggerSidebar, IDebuggerHandler, IDebuggerSourceViewer, IDebuggerDisplayRegistry } from './tokens';
|
|
9
10
|
//# sourceMappingURL=index.js.map
|