@jupyterlab/debugger 4.7.0-alpha.1 → 4.7.0-alpha.2

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/handler.js CHANGED
@@ -94,21 +94,32 @@ export class DebuggerHandler {
94
94
  * @param connection The session connection.
95
95
  */
96
96
  async update(widget, connection) {
97
+ // The caller may reach this point after awaiting session readiness, by
98
+ // which time the widget can already be disposed; connecting handlers for
99
+ // it then would leave them on the session connection permanently.
100
+ if (widget.isDisposed) {
101
+ return;
102
+ }
97
103
  if (!connection) {
98
104
  delete this._kernelChangedHandlers[widget.id];
99
105
  delete this._statusChangedHandlers[widget.id];
100
106
  delete this._iopubMessageHandlers[widget.id];
101
107
  return this.updateWidget(widget, connection);
102
108
  }
109
+ // All per-widget handlers below are connected with `widget` as receiver:
110
+ // their senders (the session connection and the debugger service) outlive
111
+ // the widget, and the receiver makes `Widget.dispose()` remove any
112
+ // connection missed by the explicit disconnects via
113
+ // `Signal.clearData(this)`.
103
114
  const kernelChanged = () => {
104
115
  void this.updateWidget(widget, connection);
105
116
  };
106
117
  const kernelChangedHandler = this._kernelChangedHandlers[widget.id];
107
118
  if (kernelChangedHandler) {
108
- connection.kernelChanged.disconnect(kernelChangedHandler);
119
+ connection.kernelChanged.disconnect(kernelChangedHandler, widget);
109
120
  }
110
121
  this._kernelChangedHandlers[widget.id] = kernelChanged;
111
- connection.kernelChanged.connect(kernelChanged);
122
+ connection.kernelChanged.connect(kernelChanged, widget);
112
123
  const statusChanged = (_, status) => {
113
124
  if (status.endsWith('restarting')) {
114
125
  void this.updateWidget(widget, connection);
@@ -116,9 +127,9 @@ export class DebuggerHandler {
116
127
  };
117
128
  const statusChangedHandler = this._statusChangedHandlers[widget.id];
118
129
  if (statusChangedHandler) {
119
- connection.statusChanged.disconnect(statusChangedHandler);
130
+ connection.statusChanged.disconnect(statusChangedHandler, widget);
120
131
  }
121
- connection.statusChanged.connect(statusChanged);
132
+ connection.statusChanged.connect(statusChanged, widget);
122
133
  this._statusChangedHandlers[widget.id] = statusChanged;
123
134
  const iopubMessage = (_, msg) => {
124
135
  if (this._service.isStarted &&
@@ -130,9 +141,9 @@ export class DebuggerHandler {
130
141
  };
131
142
  const iopubMessageHandler = this._iopubMessageHandlers[widget.id];
132
143
  if (iopubMessageHandler) {
133
- connection.iopubMessage.disconnect(iopubMessageHandler);
144
+ connection.iopubMessage.disconnect(iopubMessageHandler, widget);
134
145
  }
135
- connection.iopubMessage.connect(iopubMessage);
146
+ connection.iopubMessage.connect(iopubMessage, widget);
136
147
  this._iopubMessageHandlers[widget.id] = iopubMessage;
137
148
  this._activeWidget = widget;
138
149
  const shellMessage = (_, args) => {
@@ -143,9 +154,9 @@ export class DebuggerHandler {
143
154
  };
144
155
  const shellMessageHandler = this._shellMessageHandlers[widget.id];
145
156
  if (shellMessageHandler) {
146
- connection.anyMessage.disconnect(shellMessageHandler);
157
+ connection.anyMessage.disconnect(shellMessageHandler, widget);
147
158
  }
148
- connection.anyMessage.connect(shellMessage);
159
+ connection.anyMessage.connect(shellMessage, widget);
149
160
  this._shellMessageHandlers[widget.id] = shellMessage;
150
161
  return this.updateWidget(widget, connection);
151
162
  }
@@ -157,16 +168,29 @@ export class DebuggerHandler {
157
168
  * @param sessionContext The session context.
158
169
  */
159
170
  async updateContext(widget, sessionContext) {
171
+ if (widget.isDisposed) {
172
+ return;
173
+ }
160
174
  const connectionChanged = () => {
161
175
  const { session: connection } = sessionContext;
162
176
  void this.update(widget, connection);
163
177
  };
164
178
  const contextKernelChangedHandlers = this._contextKernelChangedHandlers[widget.id];
165
179
  if (contextKernelChangedHandlers) {
166
- sessionContext.kernelChanged.disconnect(contextKernelChangedHandlers);
180
+ sessionContext.kernelChanged.disconnect(contextKernelChangedHandlers, widget);
167
181
  }
182
+ const isFirstRegistration = !contextKernelChangedHandlers;
168
183
  this._contextKernelChangedHandlers[widget.id] = connectionChanged;
169
- sessionContext.kernelChanged.connect(connectionChanged);
184
+ sessionContext.kernelChanged.connect(connectionChanged, widget);
185
+ if (isFirstRegistration) {
186
+ // One hook per widget: this method runs on every focus switch. The
187
+ // connection itself is removed by `Signal.clearData(widget)` during
188
+ // disposal (the widget is the receiver); only the map entry on this
189
+ // application-lifetime object needs explicit cleanup.
190
+ widget.disposed.connect(() => {
191
+ delete this._contextKernelChangedHandlers[widget.id];
192
+ });
193
+ }
170
194
  return this.update(widget, sessionContext.session);
171
195
  }
172
196
  /**
@@ -177,7 +201,10 @@ export class DebuggerHandler {
177
201
  */
178
202
  async updateWidget(widget, connection) {
179
203
  var _a, _b, _c, _d, _e, _f;
180
- if (!this._service.model || !connection) {
204
+ // Callers typically await session readiness first, and the widget can be
205
+ // closed by the time that resolves; connecting handlers for it then
206
+ // would leave them on the service and the connection permanently.
207
+ if (widget.isDisposed || !this._service.model || !connection) {
181
208
  return;
182
209
  }
183
210
  const hasFocus = () => {
@@ -191,7 +218,10 @@ export class DebuggerHandler {
191
218
  widget.node.setAttribute('data-jp-debugger', 'true');
192
219
  };
193
220
  const createHandler = () => {
194
- if (this._handlers[widget.id]) {
221
+ // The widget may have been disposed during one of the awaits leading
222
+ // here; a handler created for it now would never be removed, since the
223
+ // widget's disposed signal has already fired.
224
+ if (this._handlers[widget.id] || widget.isDisposed) {
195
225
  return;
196
226
  }
197
227
  switch (this._type) {
@@ -223,16 +253,31 @@ export class DebuggerHandler {
223
253
  };
224
254
  const removeHandlers = () => {
225
255
  var _a, _b, _c, _d;
226
- this._service.stopped.disconnect(onDebuggerStopped);
256
+ this._service.stopped.disconnect(onDebuggerStopped, widget);
227
257
  const handler = this._handlers[widget.id];
228
258
  if (!handler) {
259
+ // The kernel message handlers registered by `update()` stay in place
260
+ // for widgets without a debug handler: this branch runs on every
261
+ // update that does not start debugging, and stripping them here
262
+ // would leave a subsequently started debug session without restart
263
+ // detection, variable display and `executionDone`. They are released
264
+ // when the widget is disposed: the map entries in the disposal hook
265
+ // below, the connections by `Signal.clearData(widget)` since every
266
+ // connect passes the widget as receiver.
229
267
  return;
230
268
  }
231
- handler.dispose();
232
- delete this._handlers[widget.id];
269
+ if (connection) {
270
+ // Removes the kernelChanged, statusChanged, iopubMessage and
271
+ // anyMessage slots in one call: they are the only connections
272
+ // between this connection and the widget.
273
+ Signal.disconnectBetween(connection, widget);
274
+ }
233
275
  delete this._kernelChangedHandlers[widget.id];
234
276
  delete this._statusChangedHandlers[widget.id];
235
277
  delete this._iopubMessageHandlers[widget.id];
278
+ delete this._shellMessageHandlers[widget.id];
279
+ handler.dispose();
280
+ delete this._handlers[widget.id];
236
281
  delete this._contextKernelChangedHandlers[widget.id];
237
282
  // Clear the model if the handler being removed corresponds
238
283
  // to the current active debug session, or if the connection
@@ -251,7 +296,7 @@ export class DebuggerHandler {
251
296
  updateIconButtonState(debugButton, false, true);
252
297
  }
253
298
  };
254
- this._service.stopped.connect(onDebuggerStopped);
299
+ this._service.stopped.connect(onDebuggerStopped, widget);
255
300
  const addToolbarButton = (enabled = true) => {
256
301
  const debugButton = this._iconButtons[widget.id];
257
302
  if (!debugButton) {
@@ -308,11 +353,28 @@ export class DebuggerHandler {
308
353
  await stopDebugger();
309
354
  }
310
355
  removeHandlers();
356
+ // The connections made by `update()` are removed by
357
+ // `Signal.clearData(widget)` during widget disposal (every connect
358
+ // passes the widget as receiver); the id-keyed entries on this
359
+ // application-lifetime object have to be deleted explicitly.
360
+ delete this._kernelChangedHandlers[widget.id];
361
+ delete this._statusChangedHandlers[widget.id];
362
+ delete this._iopubMessageHandlers[widget.id];
363
+ delete this._shellMessageHandlers[widget.id];
311
364
  delete this._iconButtons[widget.id];
312
365
  delete this._debuggerAvailability[widget.id];
313
366
  delete this._contextKernelChangedHandlers[widget.id];
367
+ if (this._activeWidget === widget) {
368
+ this._activeWidget = null;
369
+ }
314
370
  });
315
371
  const debuggingEnabled = await this._service.isAvailable(connection);
372
+ if (widget.isDisposed) {
373
+ // Disposed while `isAvailable` was pending: the disposal hook above
374
+ // has already deleted the per-widget entries, so writing any of them
375
+ // now would leave them behind for good.
376
+ return;
377
+ }
316
378
  this._debuggerAvailability[widget.id] = {
317
379
  kernelId,
318
380
  available: debuggingEnabled
@@ -1 +1 @@
1
- {"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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"}
@@ -56,7 +56,7 @@ export class ConsoleHandler {
56
56
  else if (event.event === 'continued' || event.event === 'terminated') {
57
57
  void this._pausedOverlay.hide();
58
58
  }
59
- });
59
+ }, this);
60
60
  // If already paused when initialized
61
61
  if (this._debuggerService.hasStoppedThreads()) {
62
62
  void this._pausedOverlay.show();
@@ -1 +1 @@
1
- {"version":3,"file":"console.js","sourceRoot":"","sources":["../../src/handlers/console.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"console.js","sourceRoot":"","sources":["../../src/handlers/console.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAO3D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD;;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;QACnD,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,cAAc,CAAC;QAEvD,IAAI,CAAC,cAAc,GAAG,IAAI,qBAAqB,CAAC;YAC9C,eAAe,EAAE,IAAI,CAAC,gBAAgB;YACtC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;YAClC,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;QAE/C,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;YAC3B,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC;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,CAAC;gBACrC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC,CAAC;QACF,WAAW,EAAE,CAAC;QACd,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE9D,0BAA0B;QAC1B,MAAA,IAAI,CAAC,gBAAgB,CAAC,OAAO,0CAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;;YAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAC9C,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC;YAEjE,IAAI,CAAC,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;gBAChC,OAAO;YACT,CAAC;YACD,IAAI,CAAA,MAAA,MAAA,OAAO,CAAC,UAAU,0CAAE,MAAM,0CAAE,EAAE,OAAK,MAAA,cAAc,CAAC,MAAM,0CAAE,EAAE,CAAA,EAAE,CAAC;gBACjE,OAAO;YACT,CAAC;YAED,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC9B,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YAClC,CAAC;iBAAM,IAAI,KAAK,CAAC,KAAK,KAAK,WAAW,IAAI,KAAK,CAAC,KAAK,KAAK,YAAY,EAAE,CAAC;gBACvE,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YAClC,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,CAAC;QAET,qCAAqC;QACrC,IAAI,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,EAAE,CAAC;YAC9C,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QAClC,CAAC;IACH,CAAC;IAOD;;OAEG;IACH,OAAO;QACL,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QAE9B,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,CAAC;YAC7D,OAAO;QACT,CAAC;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;CAOF"}
@@ -47,7 +47,7 @@ export class FileHandler {
47
47
  else if (event.event === 'continued' || event.event === 'terminated') {
48
48
  void this._pausedOverlay.hide();
49
49
  }
50
- });
50
+ }, this);
51
51
  if (this._debuggerService.hasStoppedThreads()) {
52
52
  void this._pausedOverlay.show();
53
53
  }
@@ -1 +1 @@
1
- {"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/handlers/file.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/handlers/file.ts"],"names":[],"mappings":"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"}
@@ -41,7 +41,7 @@ export class NotebookHandler {
41
41
  else if (event.event === 'continued' || event.event === 'terminated') {
42
42
  void this._pausedOverlay.hide();
43
43
  }
44
- });
44
+ }, this);
45
45
  if (this._debuggerService.hasStoppedThreads() === true) {
46
46
  void this._pausedOverlay.show();
47
47
  }
@@ -1 +1 @@
1
- {"version":3,"file":"notebook.js","sourceRoot":"","sources":["../../src/handlers/notebook.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"notebook.js","sourceRoot":"","sources":["../../src/handlers/notebook.ts"],"names":[],"mappings":"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"}
@@ -27,7 +27,7 @@ export class SourcesBody extends Widget {
27
27
  });
28
28
  this._editor.hide();
29
29
  void this._showSource();
30
- this._model.currentSourceChanged.connect(this._showSource.bind(this));
30
+ this._model.currentSourceChanged.connect(this._showSource, this);
31
31
  const layout = new PanelLayout();
32
32
  layout.addWidget(this._editor);
33
33
  this.layout = layout;
@@ -1 +1 @@
1
- {"version":3,"file":"body.js","sourceRoot":"","sources":["../../../src/panels/sources/body.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"body.js","sourceRoot":"","sources":["../../../src/panels/sources/body.ts"],"names":[],"mappings":"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"}
@@ -36,12 +36,18 @@ export declare class VariablesBodyGrid extends Panel {
36
36
  * Wait until actually displaying the grid to trigger initialization.
37
37
  */
38
38
  protected onBeforeShow(msg: Message): void;
39
+ /**
40
+ * Trigger initialization for a grid which is displayed as soon as it is
41
+ * attached, as it never gets a `before-show` message.
42
+ */
43
+ protected onAfterAttach(msg: Message): void;
39
44
  /**
40
45
  * Handle `update-request` messages.
41
46
  */
42
47
  protected onUpdateRequest(msg: Message): void;
43
48
  private _filter;
44
49
  private _grid;
50
+ private _initialScopes;
45
51
  private _pending;
46
52
  private _scope;
47
53
  }
@@ -19,7 +19,12 @@ export class VariablesBodyGrid extends Panel {
19
19
  this.model = options.model;
20
20
  this.themeManager = options.themeManager;
21
21
  this.translator = options.translator;
22
- this.model.changed.connect(() => this.update(), this);
22
+ this._initialScopes = options.scopes;
23
+ this.model.changed.connect(() => {
24
+ // The model took over the scopes given at instantiation.
25
+ this._initialScopes = undefined;
26
+ this.update();
27
+ }, this);
23
28
  this.addClass('jp-DebuggerVariables-body');
24
29
  }
25
30
  /**
@@ -57,6 +62,10 @@ export class VariablesBodyGrid extends Panel {
57
62
  }
58
63
  // Lazily load the datagrid module when the first grid is requested.
59
64
  const { Grid } = await (this._pending = import('./gridpanel'));
65
+ if (this.isDisposed) {
66
+ this._pending = null;
67
+ return;
68
+ }
60
69
  const { commands, model, themeManager, translator } = this;
61
70
  this._grid = new Grid({ commands, model, themeManager, translator });
62
71
  this._grid.addClass('jp-DebuggerVariables-grid');
@@ -68,21 +77,29 @@ export class VariablesBodyGrid extends Panel {
68
77
  * Wait until actually displaying the grid to trigger initialization.
69
78
  */
70
79
  onBeforeShow(msg) {
71
- if (!this._grid && !this._pending) {
80
+ void this.initialize();
81
+ super.onBeforeShow(msg);
82
+ }
83
+ /**
84
+ * Trigger initialization for a grid which is displayed as soon as it is
85
+ * attached, as it never gets a `before-show` message.
86
+ */
87
+ onAfterAttach(msg) {
88
+ super.onAfterAttach(msg);
89
+ if (this.isVisible) {
72
90
  void this.initialize();
73
91
  }
74
- super.onBeforeShow(msg);
75
92
  }
76
93
  /**
77
94
  * Handle `update-request` messages.
78
95
  */
79
96
  onUpdateRequest(msg) {
80
- var _a;
97
+ var _a, _b;
81
98
  if (this._grid) {
82
99
  const { dataModel } = this._grid;
83
100
  dataModel.filter = this._filter;
84
101
  dataModel.scope = this._scope;
85
- dataModel.setData((_a = this.model.scopes) !== null && _a !== void 0 ? _a : []);
102
+ dataModel.setData((_b = (_a = this._initialScopes) !== null && _a !== void 0 ? _a : this.model.scopes) !== null && _b !== void 0 ? _b : []);
86
103
  }
87
104
  super.onUpdateRequest(msg);
88
105
  }
@@ -1 +1 @@
1
- {"version":3,"file":"grid.js","sourceRoot":"","sources":["../../../src/panels/variables/grid.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"grid.js","sourceRoot":"","sources":["../../../src/panels/variables/grid.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAU3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAMxC;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAC1C;;;;OAIG;IACH,YAAY,OAAmC;QAC7C,KAAK,EAAE,CAAC;QAqGF,YAAO,GAAgB,IAAI,GAAG,EAAE,CAAC;QACjC,UAAK,GAAgC,IAAI,CAAC;QAE1C,aAAQ,GAA4B,IAAI,CAAC;QAvG/C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;YAC9B,yDAAyD;YACzD,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;YAChC,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,CAAC,EAAE,IAAI,CAAC,CAAC;QACT,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,IAAI,MAAM,CAAC,MAAmB;QAC5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IACD,IAAI,KAAK,CAAC,KAAa;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAOD;;OAEG;IACO,KAAK,CAAC,UAAU;QACxB,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,oEAAoE;QACpE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QAC/D,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,OAAO;QACT,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAE3D,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED;;OAEG;IACO,YAAY,CAAC,GAAY;QACjC,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;QACvB,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACO,aAAa,CAAC,GAAY;QAClC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAED;;OAEG;IACO,eAAe,CAAC,GAAY;;QACpC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACjC,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;YAChC,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;YAC9B,SAAS,CAAC,OAAO,CAAC,MAAA,MAAA,IAAI,CAAC,cAAc,mCAAI,IAAI,CAAC,KAAK,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CAOF"}
@@ -23,7 +23,11 @@ const ScopeSwitcherComponent = ({ model, tree, grid, trans }) => {
23
23
  tree.scope = value;
24
24
  grid.scope = value;
25
25
  };
26
- return (React.createElement(HTMLSelect, { onChange: onChange, value: value, "aria-label": trans.__('Scope') }, scopes.map(scope => (React.createElement("option", { key: scope.name, value: scope.name }, trans.__(scope.name))))));
26
+ return (React.createElement(HTMLSelect, { onChange: onChange, value: value, "aria-label": trans.__('Scope') }, scopes.map(scope => (React.createElement("option", { key: scope.name, value: scope.name },
27
+ // Scope names are chosen by the debug adapter, so there is no
28
+ // literal to extract here.
29
+ // eslint-disable-next-line jupyter/no-dynamic-translation
30
+ trans.__(scope.name))))));
27
31
  };
28
32
  /**
29
33
  * A widget to switch between scopes.
@@ -1 +1 @@
1
- {"version":3,"file":"scope.js","sourceRoot":"","sources":["../../../src/panels/variables/scope.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAKxC;;;;;;;;GAQG;AACH,MAAM,sBAAsB,GAAG,CAAC,EAC9B,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,KAAK,EAMN,EAAe,EAAE;IAChB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAE5B,MAAM,QAAQ,GAAG,CAAC,KAA2C,EAAE,EAAE;QAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;QACjC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,UAAU,IACT,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,gBACA,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,IAE5B,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CACnB,gCAAQ,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,IACvC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CACd,CACV,CAAC,CACS,CACd,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,OAAO,aAAc,SAAQ,WAAW;IAC5C;;;;OAIG;IACH,YAAY,OAA+B;QACzC,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QAClD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClE,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO,CACL,oBAAC,SAAS,IAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,IAC/D,GAAgB,EAAE,CAAC,CAClB,oBAAC,sBAAsB,IACrB,KAAK,EAAE,IAAI,CAAC,MAAM,EAClB,KAAK,EAAE,IAAI,CAAC,MAAM,EAClB,IAAI,EAAE,IAAI,CAAC,KAAK,EAChB,IAAI,EAAE,IAAI,CAAC,KAAK,GAChB,CACH,CACS,CACb,CAAC;IACJ,CAAC;CAMF"}
1
+ {"version":3,"file":"scope.js","sourceRoot":"","sources":["../../../src/panels/variables/scope.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAKxC;;;;;;;;GAQG;AACH,MAAM,sBAAsB,GAAG,CAAC,EAC9B,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,KAAK,EAMN,EAAe,EAAE;IAChB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAE5B,MAAM,QAAQ,GAAG,CAAC,KAA2C,EAAE,EAAE;QAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;QACjC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,UAAU,IACT,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,gBACA,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,IAE5B,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CACnB,gCAAQ,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI;IAEtC,8DAA8D;IAC9D,2BAA2B;IAC3B,0DAA0D;IAC1D,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAEf,CACV,CAAC,CACS,CACd,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,OAAO,aAAc,SAAQ,WAAW;IAC5C;;;;OAIG;IACH,YAAY,OAA+B;QACzC,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QAClD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClE,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO,CACL,oBAAC,SAAS,IAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,IAC/D,GAAgB,EAAE,CAAC,CAClB,oBAAC,sBAAsB,IACrB,KAAK,EAAE,IAAI,CAAC,MAAM,EAClB,KAAK,EAAE,IAAI,CAAC,MAAM,EAClB,IAAI,EAAE,IAAI,CAAC,KAAK,EAChB,IAAI,EAAE,IAAI,CAAC,KAAK,GAChB,CACH,CACS,CACb,CAAC;IACJ,CAAC;CAMF"}
package/lib/sidebar.js CHANGED
@@ -59,7 +59,7 @@ export class DebuggerSidebar extends SidePanel {
59
59
  this.header.addWidget(header);
60
60
  model.titleChanged.connect((_, title) => {
61
61
  header.title.label = title;
62
- });
62
+ }, this);
63
63
  this.content.addClass('jp-DebuggerSidebar-body');
64
64
  this.addWidget(this.variables);
65
65
  this.addWidget(this.callstack);
@@ -1 +1 @@
1
- {"version":3,"file":"sidebar.js","sourceRoot":"","sources":["../src/sidebar.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sidebar.js","sourceRoot":"","sources":["../src/sidebar.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAO3D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAEvE,OAAO,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,aAAa,IAAI,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE7E,OAAO,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAMjE;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAC5C;;;;OAIG;IACH,YAAY,OAAiC;QAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,cAAc,CAAC;QACxD,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QAuHhB,sBAAiB,GAAG,KAAK,CAAC;QAtHhC,IAAI,CAAC,EAAE,GAAG,qBAAqB,CAAC;QAChC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;QAEpC,MAAM,EACJ,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,OAAO,EACP,YAAY,EACb,GAAG,OAAO,CAAC;QAEZ,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,eAAe,GAAG;YACrB,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,OAAO;YACP,cAAc;YACd,UAAU;SACX,CAAC;QAEF,IAAI,CAAC,SAAS,GAAG,IAAI,cAAc,CAAC;YAClC,KAAK,EAAE,KAAK,CAAC,SAAS;YACtB,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;YACpC,OAAO;YACP,YAAY;YACZ,UAAU;SACX,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,GAAG,IAAI,cAAc,CAAC;YAClC,QAAQ,EAAE,iBAAiB;YAC3B,KAAK,EAAE,KAAK,CAAC,SAAS;YACtB,UAAU;SACX,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,GAAG,IAAI,gBAAgB,CAAC;YACtC,OAAO;YACP,QAAQ,EAAE,mBAAmB;YAC7B,KAAK,EAAE,KAAK,CAAC,WAAW;YACxB,UAAU;SACX,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,GAAG,IAAI,kBAAkB,CAAC;YAC1C,KAAK,EAAE,KAAK,CAAC,aAAa;YAC1B,OAAO;YACP,UAAU;SACX,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,EAAE,CAAC;QAE5C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC9B,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YACtC,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;QAC7B,CAAC,EAAE,IAAI,CAAC,CAAC;QAET,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QAEjD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,IAAI,gBAAgB,CAAC,KAAc;QACjC,IAAI,KAAK,KAAK,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAE/B,IAAI,KAAK,EAAE,CAAC;YACV,mDAAmD;YAEnD,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAC/C,IAAI,CAAC,QAAQ,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBACvD,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,wDAAwD;YACxD,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAC/C,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACxB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAiBD;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CASF;AAED;;GAEG;AACH,WAAiB,eAAe;IAyC9B;;OAEG;IACH,MAAa,MAAO,SAAQ,MAAM;QAChC;;WAEG;QACH;YACE,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YAC3C,CAAC,CAAC,CAAC;QACL,CAAC;KACF;IAVY,sBAAM,SAUlB,CAAA;AACH,CAAC,EAvDgB,eAAe,KAAf,eAAe,QAuD/B;AAED;;GAEG;AACH,IAAU,OAAO,CAYhB;AAZD,WAAU,OAAO;IACf;;OAEG;IACH,SAAgB,YAAY;QAC1B,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAE3C,KAAK,CAAC,WAAW,GAAG,GAAG,CAAC;QACxB,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAEzC,OAAO,KAAK,CAAC;IACf,CAAC;IAPe,oBAAY,eAO3B,CAAA;AACH,CAAC,EAZS,OAAO,KAAP,OAAO,QAYhB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jupyterlab/debugger",
3
- "version": "4.7.0-alpha.1",
3
+ "version": "4.7.0-alpha.2",
4
4
  "description": "JupyterLab - Debugger Extension",
5
5
  "keywords": [
6
6
  "jupyter",
@@ -49,24 +49,24 @@
49
49
  "dependencies": {
50
50
  "@codemirror/state": "^6.5.4",
51
51
  "@codemirror/view": "^6.39.14",
52
- "@jupyter/react-components": "^0.16.6",
52
+ "@jupyter/react-components": "^0.17.1",
53
53
  "@jupyter/ydoc": "^4.0.0",
54
- "@jupyterlab/application": "^4.7.0-alpha.1",
55
- "@jupyterlab/apputils": "^4.8.0-alpha.1",
56
- "@jupyterlab/cells": "^4.7.0-alpha.1",
57
- "@jupyterlab/codeeditor": "^4.7.0-alpha.1",
58
- "@jupyterlab/codemirror": "^4.7.0-alpha.1",
59
- "@jupyterlab/console": "^4.7.0-alpha.1",
60
- "@jupyterlab/coreutils": "^6.7.0-alpha.1",
61
- "@jupyterlab/docregistry": "^4.7.0-alpha.1",
62
- "@jupyterlab/fileeditor": "^4.7.0-alpha.1",
63
- "@jupyterlab/notebook": "^4.7.0-alpha.1",
64
- "@jupyterlab/observables": "^5.7.0-alpha.1",
65
- "@jupyterlab/rendermime": "^4.7.0-alpha.1",
66
- "@jupyterlab/services": "^7.7.0-alpha.1",
67
- "@jupyterlab/settingregistry": "^4.7.0-alpha.1",
68
- "@jupyterlab/translation": "^4.7.0-alpha.1",
69
- "@jupyterlab/ui-components": "^4.7.0-alpha.1",
54
+ "@jupyterlab/application": "^4.7.0-alpha.2",
55
+ "@jupyterlab/apputils": "^4.8.0-alpha.2",
56
+ "@jupyterlab/cells": "^4.7.0-alpha.2",
57
+ "@jupyterlab/codeeditor": "^4.7.0-alpha.2",
58
+ "@jupyterlab/codemirror": "^4.7.0-alpha.2",
59
+ "@jupyterlab/console": "^4.7.0-alpha.2",
60
+ "@jupyterlab/coreutils": "^6.7.0-alpha.2",
61
+ "@jupyterlab/docregistry": "^4.7.0-alpha.2",
62
+ "@jupyterlab/fileeditor": "^4.7.0-alpha.2",
63
+ "@jupyterlab/notebook": "^4.7.0-alpha.2",
64
+ "@jupyterlab/observables": "^5.7.0-alpha.2",
65
+ "@jupyterlab/rendermime": "^4.7.0-alpha.2",
66
+ "@jupyterlab/services": "^7.7.0-alpha.2",
67
+ "@jupyterlab/settingregistry": "^4.7.0-alpha.2",
68
+ "@jupyterlab/translation": "^4.7.0-alpha.2",
69
+ "@jupyterlab/ui-components": "^4.7.0-alpha.2",
70
70
  "@lumino/algorithm": "^2.0.5",
71
71
  "@lumino/commands": "^2.3.4",
72
72
  "@lumino/coreutils": "^2.2.3",
@@ -80,7 +80,7 @@
80
80
  "react": "^18.2.0"
81
81
  },
82
82
  "devDependencies": {
83
- "@jupyterlab/testing": "^4.7.0-alpha.1",
83
+ "@jupyterlab/testing": "^4.7.0-alpha.2",
84
84
  "@types/jest": "^29.2.0",
85
85
  "jest": "^29.2.0",
86
86
  "jest-canvas-mock": "^2.5.2",
package/src/handler.ts CHANGED
@@ -131,6 +131,12 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
131
131
  widget: DebuggerHandler.SessionWidget[DebuggerHandler.SessionType],
132
132
  connection: Session.ISessionConnection | null
133
133
  ): Promise<void> {
134
+ // The caller may reach this point after awaiting session readiness, by
135
+ // which time the widget can already be disposed; connecting handlers for
136
+ // it then would leave them on the session connection permanently.
137
+ if (widget.isDisposed) {
138
+ return;
139
+ }
134
140
  if (!connection) {
135
141
  delete this._kernelChangedHandlers[widget.id];
136
142
  delete this._statusChangedHandlers[widget.id];
@@ -138,16 +144,21 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
138
144
  return this.updateWidget(widget, connection);
139
145
  }
140
146
 
147
+ // All per-widget handlers below are connected with `widget` as receiver:
148
+ // their senders (the session connection and the debugger service) outlive
149
+ // the widget, and the receiver makes `Widget.dispose()` remove any
150
+ // connection missed by the explicit disconnects via
151
+ // `Signal.clearData(this)`.
141
152
  const kernelChanged = (): void => {
142
153
  void this.updateWidget(widget, connection);
143
154
  };
144
155
  const kernelChangedHandler = this._kernelChangedHandlers[widget.id];
145
156
 
146
157
  if (kernelChangedHandler) {
147
- connection.kernelChanged.disconnect(kernelChangedHandler);
158
+ connection.kernelChanged.disconnect(kernelChangedHandler, widget);
148
159
  }
149
160
  this._kernelChangedHandlers[widget.id] = kernelChanged;
150
- connection.kernelChanged.connect(kernelChanged);
161
+ connection.kernelChanged.connect(kernelChanged, widget);
151
162
 
152
163
  const statusChanged = (
153
164
  _: Session.ISessionConnection,
@@ -159,9 +170,9 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
159
170
  };
160
171
  const statusChangedHandler = this._statusChangedHandlers[widget.id];
161
172
  if (statusChangedHandler) {
162
- connection.statusChanged.disconnect(statusChangedHandler);
173
+ connection.statusChanged.disconnect(statusChangedHandler, widget);
163
174
  }
164
- connection.statusChanged.connect(statusChanged);
175
+ connection.statusChanged.connect(statusChanged, widget);
165
176
  this._statusChangedHandlers[widget.id] = statusChanged;
166
177
 
167
178
  const iopubMessage = (
@@ -179,9 +190,9 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
179
190
  };
180
191
  const iopubMessageHandler = this._iopubMessageHandlers[widget.id];
181
192
  if (iopubMessageHandler) {
182
- connection.iopubMessage.disconnect(iopubMessageHandler);
193
+ connection.iopubMessage.disconnect(iopubMessageHandler, widget);
183
194
  }
184
- connection.iopubMessage.connect(iopubMessage);
195
+ connection.iopubMessage.connect(iopubMessage, widget);
185
196
  this._iopubMessageHandlers[widget.id] = iopubMessage;
186
197
  this._activeWidget = widget;
187
198
 
@@ -196,10 +207,10 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
196
207
  };
197
208
  const shellMessageHandler = this._shellMessageHandlers[widget.id];
198
209
  if (shellMessageHandler) {
199
- connection.anyMessage.disconnect(shellMessageHandler);
210
+ connection.anyMessage.disconnect(shellMessageHandler, widget);
200
211
  }
201
212
 
202
- connection.anyMessage.connect(shellMessage);
213
+ connection.anyMessage.connect(shellMessage, widget);
203
214
  this._shellMessageHandlers[widget.id] = shellMessage;
204
215
 
205
216
  return this.updateWidget(widget, connection);
@@ -216,6 +227,9 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
216
227
  widget: DebuggerHandler.SessionWidget[DebuggerHandler.SessionType],
217
228
  sessionContext: ISessionContext
218
229
  ): Promise<void> {
230
+ if (widget.isDisposed) {
231
+ return;
232
+ }
219
233
  const connectionChanged = (): void => {
220
234
  const { session: connection } = sessionContext;
221
235
  void this.update(widget, connection);
@@ -225,10 +239,23 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
225
239
  this._contextKernelChangedHandlers[widget.id];
226
240
 
227
241
  if (contextKernelChangedHandlers) {
228
- sessionContext.kernelChanged.disconnect(contextKernelChangedHandlers);
242
+ sessionContext.kernelChanged.disconnect(
243
+ contextKernelChangedHandlers,
244
+ widget
245
+ );
229
246
  }
247
+ const isFirstRegistration = !contextKernelChangedHandlers;
230
248
  this._contextKernelChangedHandlers[widget.id] = connectionChanged;
231
- sessionContext.kernelChanged.connect(connectionChanged);
249
+ sessionContext.kernelChanged.connect(connectionChanged, widget);
250
+ if (isFirstRegistration) {
251
+ // One hook per widget: this method runs on every focus switch. The
252
+ // connection itself is removed by `Signal.clearData(widget)` during
253
+ // disposal (the widget is the receiver); only the map entry on this
254
+ // application-lifetime object needs explicit cleanup.
255
+ widget.disposed.connect(() => {
256
+ delete this._contextKernelChangedHandlers[widget.id];
257
+ });
258
+ }
232
259
 
233
260
  return this.update(widget, sessionContext.session);
234
261
  }
@@ -243,7 +270,10 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
243
270
  widget: DebuggerHandler.SessionWidget[DebuggerHandler.SessionType],
244
271
  connection: Session.ISessionConnection | null
245
272
  ): Promise<void> {
246
- if (!this._service.model || !connection) {
273
+ // Callers typically await session readiness first, and the widget can be
274
+ // closed by the time that resolves; connecting handlers for it then
275
+ // would leave them on the service and the connection permanently.
276
+ if (widget.isDisposed || !this._service.model || !connection) {
247
277
  return;
248
278
  }
249
279
 
@@ -260,7 +290,10 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
260
290
  };
261
291
 
262
292
  const createHandler = (): void => {
263
- if (this._handlers[widget.id]) {
293
+ // The widget may have been disposed during one of the awaits leading
294
+ // here; a handler created for it now would never be removed, since the
295
+ // widget's disposed signal has already fired.
296
+ if (this._handlers[widget.id] || widget.isDisposed) {
264
297
  return;
265
298
  }
266
299
 
@@ -293,18 +326,34 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
293
326
  };
294
327
 
295
328
  const removeHandlers = (): void => {
296
- this._service.stopped.disconnect(onDebuggerStopped);
329
+ this._service.stopped.disconnect(onDebuggerStopped, widget);
297
330
 
298
331
  const handler = this._handlers[widget.id];
299
332
  if (!handler) {
333
+ // The kernel message handlers registered by `update()` stay in place
334
+ // for widgets without a debug handler: this branch runs on every
335
+ // update that does not start debugging, and stripping them here
336
+ // would leave a subsequently started debug session without restart
337
+ // detection, variable display and `executionDone`. They are released
338
+ // when the widget is disposed: the map entries in the disposal hook
339
+ // below, the connections by `Signal.clearData(widget)` since every
340
+ // connect passes the widget as receiver.
300
341
  return;
301
342
  }
302
343
 
303
- handler.dispose();
304
- delete this._handlers[widget.id];
344
+ if (connection) {
345
+ // Removes the kernelChanged, statusChanged, iopubMessage and
346
+ // anyMessage slots in one call: they are the only connections
347
+ // between this connection and the widget.
348
+ Signal.disconnectBetween(connection, widget);
349
+ }
305
350
  delete this._kernelChangedHandlers[widget.id];
306
351
  delete this._statusChangedHandlers[widget.id];
307
352
  delete this._iopubMessageHandlers[widget.id];
353
+ delete this._shellMessageHandlers[widget.id];
354
+
355
+ handler.dispose();
356
+ delete this._handlers[widget.id];
308
357
  delete this._contextKernelChangedHandlers[widget.id];
309
358
 
310
359
  // Clear the model if the handler being removed corresponds
@@ -331,7 +380,7 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
331
380
  }
332
381
  };
333
382
 
334
- this._service.stopped.connect(onDebuggerStopped);
383
+ this._service.stopped.connect(onDebuggerStopped, widget);
335
384
 
336
385
  const addToolbarButton = (enabled: boolean = true): void => {
337
386
  const debugButton = this._iconButtons[widget.id];
@@ -405,12 +454,29 @@ export class DebuggerHandler implements DebuggerHandler.IHandler {
405
454
  await stopDebugger();
406
455
  }
407
456
  removeHandlers();
457
+ // The connections made by `update()` are removed by
458
+ // `Signal.clearData(widget)` during widget disposal (every connect
459
+ // passes the widget as receiver); the id-keyed entries on this
460
+ // application-lifetime object have to be deleted explicitly.
461
+ delete this._kernelChangedHandlers[widget.id];
462
+ delete this._statusChangedHandlers[widget.id];
463
+ delete this._iopubMessageHandlers[widget.id];
464
+ delete this._shellMessageHandlers[widget.id];
408
465
  delete this._iconButtons[widget.id];
409
466
  delete this._debuggerAvailability[widget.id];
410
467
  delete this._contextKernelChangedHandlers[widget.id];
468
+ if (this._activeWidget === widget) {
469
+ this._activeWidget = null;
470
+ }
411
471
  });
412
472
 
413
473
  const debuggingEnabled = await this._service.isAvailable(connection);
474
+ if (widget.isDisposed) {
475
+ // Disposed while `isAvailable` was pending: the disposal hook above
476
+ // has already deleted the per-widget entries, so writing any of them
477
+ // now would leave them behind for good.
478
+ return;
479
+ }
414
480
  this._debuggerAvailability[widget.id] = {
415
481
  kernelId,
416
482
  available: debuggingEnabled
@@ -74,7 +74,7 @@ export class ConsoleHandler implements IDisposable {
74
74
  } else if (event.event === 'continued' || event.event === 'terminated') {
75
75
  void this._pausedOverlay.hide();
76
76
  }
77
- });
77
+ }, this);
78
78
 
79
79
  // If already paused when initialized
80
80
  if (this._debuggerService.hasStoppedThreads()) {
@@ -63,7 +63,7 @@ export class FileHandler implements IDisposable {
63
63
  } else if (event.event === 'continued' || event.event === 'terminated') {
64
64
  void this._pausedOverlay.hide();
65
65
  }
66
- });
66
+ }, this);
67
67
 
68
68
  if (this._debuggerService.hasStoppedThreads()) {
69
69
  void this._pausedOverlay.show();
@@ -51,7 +51,7 @@ export class NotebookHandler implements IDisposable {
51
51
  } else if (event.event === 'continued' || event.event === 'terminated') {
52
52
  void this._pausedOverlay.hide();
53
53
  }
54
- });
54
+ }, this);
55
55
 
56
56
  if (this._debuggerService.hasStoppedThreads() === true) {
57
57
  void this._pausedOverlay.show();
@@ -44,7 +44,7 @@ export class SourcesBody extends Widget {
44
44
 
45
45
  void this._showSource();
46
46
 
47
- this._model.currentSourceChanged.connect(this._showSource.bind(this));
47
+ this._model.currentSourceChanged.connect(this._showSource, this);
48
48
 
49
49
  const layout = new PanelLayout();
50
50
  layout.addWidget(this._editor);
@@ -30,7 +30,12 @@ export class VariablesBodyGrid extends Panel {
30
30
  this.model = options.model;
31
31
  this.themeManager = options.themeManager;
32
32
  this.translator = options.translator;
33
- this.model.changed.connect(() => this.update(), this);
33
+ this._initialScopes = options.scopes;
34
+ this.model.changed.connect(() => {
35
+ // The model took over the scopes given at instantiation.
36
+ this._initialScopes = undefined;
37
+ this.update();
38
+ }, this);
34
39
  this.addClass('jp-DebuggerVariables-body');
35
40
  }
36
41
 
@@ -76,6 +81,10 @@ export class VariablesBodyGrid extends Panel {
76
81
 
77
82
  // Lazily load the datagrid module when the first grid is requested.
78
83
  const { Grid } = await (this._pending = import('./gridpanel'));
84
+ if (this.isDisposed) {
85
+ this._pending = null;
86
+ return;
87
+ }
79
88
  const { commands, model, themeManager, translator } = this;
80
89
 
81
90
  this._grid = new Grid({ commands, model, themeManager, translator });
@@ -89,10 +98,19 @@ export class VariablesBodyGrid extends Panel {
89
98
  * Wait until actually displaying the grid to trigger initialization.
90
99
  */
91
100
  protected onBeforeShow(msg: Message): void {
92
- if (!this._grid && !this._pending) {
101
+ void this.initialize();
102
+ super.onBeforeShow(msg);
103
+ }
104
+
105
+ /**
106
+ * Trigger initialization for a grid which is displayed as soon as it is
107
+ * attached, as it never gets a `before-show` message.
108
+ */
109
+ protected onAfterAttach(msg: Message): void {
110
+ super.onAfterAttach(msg);
111
+ if (this.isVisible) {
93
112
  void this.initialize();
94
113
  }
95
- super.onBeforeShow(msg);
96
114
  }
97
115
 
98
116
  /**
@@ -103,13 +121,14 @@ export class VariablesBodyGrid extends Panel {
103
121
  const { dataModel } = this._grid;
104
122
  dataModel.filter = this._filter;
105
123
  dataModel.scope = this._scope;
106
- dataModel.setData(this.model.scopes ?? []);
124
+ dataModel.setData(this._initialScopes ?? this.model.scopes ?? []);
107
125
  }
108
126
  super.onUpdateRequest(msg);
109
127
  }
110
128
 
111
129
  private _filter: Set<string> = new Set();
112
130
  private _grid: GridPanelModule.Grid | null = null;
131
+ private _initialScopes: IDebugger.IScope[] | undefined;
113
132
  private _pending: Promise<unknown> | null = null;
114
133
  private _scope: string;
115
134
  }
@@ -49,7 +49,12 @@ const ScopeSwitcherComponent = ({
49
49
  >
50
50
  {scopes.map(scope => (
51
51
  <option key={scope.name} value={scope.name}>
52
- {trans.__(scope.name)}
52
+ {
53
+ // Scope names are chosen by the debug adapter, so there is no
54
+ // literal to extract here.
55
+ // eslint-disable-next-line jupyter/no-dynamic-translation
56
+ trans.__(scope.name)
57
+ }
53
58
  </option>
54
59
  ))}
55
60
  </HTMLSelect>
package/src/sidebar.ts CHANGED
@@ -90,7 +90,7 @@ export class DebuggerSidebar extends SidePanel {
90
90
  this.header.addWidget(header);
91
91
  model.titleChanged.connect((_, title) => {
92
92
  header.title.label = title;
93
- });
93
+ }, this);
94
94
 
95
95
  this.content.addClass('jp-DebuggerSidebar-body');
96
96