@jupyterlab/debugger 4.0.0-alpha.1 → 4.0.0-alpha.12

package/lib/debugger.d.ts

@@ -83,6 +83,7 @@ export declare namespace Debugger {
         const renderMimeVariable = "debugger:render-mime-variable";
         const evaluate = "debugger:evaluate";
         const restartDebug = "debugger:restart-debug";
+        const pause = "debugger:pause";
     }
     /**
      * The debugger user interface icons.
@@ -97,6 +98,7 @@ export declare namespace Debugger {
         const terminateIcon: import("@jupyterlab/ui-components").LabIcon;
         const variableIcon: import("@jupyterlab/ui-components").LabIcon;
         const viewBreakpointIcon: import("@jupyterlab/ui-components").LabIcon;
+        const pauseOnExceptionsIcon: import("@jupyterlab/ui-components").LabIcon;
     }
     /**
      * The debugger dialog helpers.

package/lib/debugger.js

@@ -6,7 +6,7 @@ import { DebuggerEvaluateDialog } from './dialogs/evaluate';
 import { ReadOnlyEditorFactory as EditorFactory } from './factory';
 import { DebuggerHandler } from './handler';
 import { EditorHandler as DebuggerEditorHandler } from './handlers/editor';
-import { closeAllIcon as closeAll, stepIntoIcon as stepInto, stepOutIcon as stepOut, stepOverIcon as stepOver, variableIcon as variable, viewBreakpointIcon as viewBreakpoint } from './icons';
+import { closeAllIcon as closeAll, pauseOnExceptionsIcon as pauseOnExceptions, stepIntoIcon as stepInto, stepOutIcon as stepOut, stepOverIcon as stepOver, variableIcon as variable, viewBreakpointIcon as viewBreakpoint } from './icons';
 import { DebuggerModel } from './model';
 import { VariablesBodyGrid } from './panels/variables/grid';
 import { VariableMimeRenderer } from './panels/variables/mimerenderer';
@@ -100,6 +100,7 @@ export var Debugger;
         CommandIDs.renderMimeVariable = 'debugger:render-mime-variable';
         CommandIDs.evaluate = 'debugger:evaluate';
         CommandIDs.restartDebug = 'debugger:restart-debug';
+        CommandIDs.pause = 'debugger:pause';
     })(CommandIDs = Debugger.CommandIDs || (Debugger.CommandIDs = {}));
     /**
      * The debugger user interface icons.
@@ -115,6 +116,7 @@ export var Debugger;
         Icons.terminateIcon = stopIcon;
         Icons.variableIcon = variable;
         Icons.viewBreakpointIcon = viewBreakpoint;
+        Icons.pauseOnExceptionsIcon = pauseOnExceptions;
     })(Icons = Debugger.Icons || (Debugger.Icons = {}));
     /**
      * The debugger dialog helpers.

package/lib/debugger.js.map

@@ -1 +1 @@
-{"version":3,"file":"debugger.js","sourceRoot":"","sources":["../src/debugger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"debugger.js","sourceRoot":"","sources":["../src/debugger.ts"],"names":[],"mappings":"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"}

package/lib/dialogs/evaluate.js

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) Jupyter Development Team.
+ * Distributed under the terms of the Modified BSD License.
+ */
 import { Dialog } from '@jupyterlab/apputils';
 import { CodeCell, CodeCellModel } from '@jupyterlab/cells';
 import { Widget } from '@lumino/widgets';

package/lib/dialogs/evaluate.js.map

@@ -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,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAM5D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC;;GAEG;AACH,MAAM,KAAW,sBAAsB,CAiDtC;AAjDD,WAAiB,sBAAsB;IA+BrC;;;;;;OAMG;IACH,SAAgB,OAAO,CAAC,OAAiB;QACvC,MAAM,MAAM,GAAG,IAAI,cAAc,iCAC5B,OAAO,KACV,IAAI,EAAE,IAAI,kBAAkB,CAAC,OAAO,CAAC,EACrC,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,IACD,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;IAVe,8BAAO,UAUtB,CAAA;AACH,CAAC,EAjDgB,sBAAsB,KAAtB,sBAAsB,QAiDtC;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,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAEzC,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;QACpC,KAAK,CAAC,QAAQ,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,IAAI,QAAQ,CAAC;YAC1B,UAAU;YACV,KAAK;SACN,CAAC,CAAC,eAAe,EAAE,CAAC;QAErB,0DAA0D;QAC1D,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QAE3C,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,KAAK,CAAC,IAAI,CAAC;IACvC,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"}
+{"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,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAM5D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC;;GAEG;AACH,MAAM,KAAW,sBAAsB,CAiDtC;AAjDD,WAAiB,sBAAsB;IA+BrC;;;;;;OAMG;IACH,SAAgB,OAAO,CAAC,OAAiB;QACvC,MAAM,MAAM,GAAG,IAAI,cAAc,iCAC5B,OAAO,KACV,IAAI,EAAE,IAAI,kBAAkB,CAAC,OAAO,CAAC,EACrC,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,IACD,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;IAVe,8BAAO,UAUtB,CAAA;AACH,CAAC,EAjDgB,sBAAsB,KAAtB,sBAAsB,QAiDtC;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,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAEzC,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;QACpC,KAAK,CAAC,QAAQ,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,IAAI,QAAQ,CAAC;YAC1B,UAAU;YACV,KAAK;SACN,CAAC,CAAC,eAAe,EAAE,CAAC;QAErB,0DAA0D;QAC1D,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QAE3C,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,KAAK,CAAC,IAAI,CAAC;IACvC,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/handler.js

@@ -155,7 +155,7 @@ export class DebuggerHandler {
      * @param connection The session connection.
      */
     async updateWidget(widget, connection) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (!this._service.model || !connection) {
             return;
         }
@@ -238,10 +238,14 @@ export class DebuggerHandler {
             await this._service.stop();
         };
         const startDebugger = async () => {
+            var _a, _b;
             this._service.session.connection = connection;
             this._previousConnection = connection;
             await this._service.restoreState(true);
             await this._service.displayDefinedVariables();
+            if ((_b = (_a = this._service.session) === null || _a === void 0 ? void 0 : _a.capabilities) === null || _b === void 0 ? void 0 : _b.supportsModulesRequest) {
+                await this._service.displayModules();
+            }
         };
         const toggleDebugging = async () => {
             // bail if the widget doesn't have focus
@@ -261,6 +265,15 @@ export class DebuggerHandler {
             }
         };
         addToolbarButton(false);
+        // listen to the disposed signals
+        widget.disposed.connect(async () => {
+            if (isDebuggerOn()) {
+                await stopDebugger();
+            }
+            removeHandlers();
+            delete this._iconButtons[widget.id];
+            delete this._contextKernelChangedHandlers[widget.id];
+        });
         const debuggingEnabled = await this._service.isAvailable(connection);
         if (!debuggingEnabled) {
             removeHandlers();
@@ -272,27 +285,29 @@ export class DebuggerHandler {
             this._service.session = new Debugger.Session({ connection });
         }
         else {
-            this._previousConnection = ((_a = this._service.session.connection) === null || _a === void 0 ? void 0 : _a.kernel) ? this._service.session.connection
+            this._previousConnection = ((_a = this._service.session.connection) === null || _a === void 0 ? void 0 : _a.kernel)
+                ? this._service.session.connection
                 : null;
             this._service.session.connection = connection;
         }
         await this._service.restoreState(false);
         if (this._service.isStarted && !this._service.hasStoppedThreads()) {
             await this._service.displayDefinedVariables();
+            if ((_c = (_b = this._service.session) === null || _b === void 0 ? void 0 : _b.capabilities) === null || _c === void 0 ? void 0 : _c.supportsModulesRequest) {
+                await this._service.displayModules();
+            }
         }
         updateIconButtonState(this._iconButtons[widget.id], this._service.isStarted, true);
         // check the state of the debug session
         if (!this._service.isStarted) {
             removeHandlers();
-            this._service.session.connection = (_b = this._previousConnection) !== null && _b !== void 0 ? _b : connection;
+            this._service.session.connection = (_d = this._previousConnection) !== null && _d !== void 0 ? _d : connection;
             await this._service.restoreState(false);
             return;
         }
         // if the debugger is started but there is no handler, create a new one
         createHandler();
         this._previousConnection = connection;
-        // listen to the disposed signals
-        widget.disposed.connect(removeHandlers);
     }
 }
 //# sourceMappingURL=handler.js.map

package/lib/handler.js.map

@@ -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;QA8SrC,cAAS,GAEb,EAAE,CAAC;QAEC,kCAA6B,GASjC,EAAE,CAAC;QACC,2BAAsB,GAS1B,EAAE,CAAC;QACC,2BAAsB,GAK1B,EAAE,CAAC;QACC,0BAAqB,GAKzB,EAAE,CAAC;QACC,iBAAY,GAEhB,EAAE,CAAC;QAnVL,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,IAAI,YAAY;QAGd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,MAAM,CACV,MAAkE,EAClE,UAA6C;QAE7C,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;SAC9C;QAED,MAAM,aAAa,GAAG,GAAS,EAAE;YAC/B,KAAK,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC7C,CAAC,CAAC;QACF,MAAM,oBAAoB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEpE,IAAI,oBAAoB,EAAE;YACxB,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;SAC3D;QACD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;QACvD,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAEhD,MAAM,aAAa,GAAG,CACpB,CAA6B,EAC7B,MAAqB,EACf,EAAE;YACR,4BAA4B;YAC5B,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;gBACjC,KAAK,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC;QACF,MAAM,oBAAoB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACpE,IAAI,oBAAoB,EAAE;YACxB,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;SAC3D;QACD,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAChD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;QAEvD,MAAM,YAAY,GAAG,CACnB,CAA6B,EAC7B,GAAgC,EAC1B,EAAE;YACR,IACE,GAAG,CAAC,aAAa,IAAI,EAAE;gBACtB,GAAG,CAAC,aAAuC,CAAC,QAAQ;oBACnD,iBAAiB;gBACnB,IAAI,CAAC,QAAQ,CAAC,SAAS;gBACvB,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,EAClC;gBACA,KAAK,IAAI,CAAC,QAAQ,CAAC,uBAAuB,EAAE,CAAC;aAC9C;QACH,CAAC,CAAC;QACF,MAAM,mBAAmB,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAClE,IAAI,mBAAmB,EAAE;YACvB,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;SACzD;QACD,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC9C,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC;QACrD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;QAE5B,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,aAAa,CACjB,MAAkE,EAClE,cAA+B;QAE/B,MAAM,iBAAiB,GAAG,GAAS,EAAE;YACnC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;YAC/C,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACvC,CAAC,CAAC;QAEF,MAAM,4BAA4B,GAAG,IAAI,CAAC,6BAA6B,CACrE,MAAM,CAAC,EAAE,CACV,CAAC;QAEF,IAAI,4BAA4B,EAAE;YAChC,cAAc,CAAC,aAAa,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAC;SACvE;QACD,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC;QAClE,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAExD,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,YAAY,CAChB,MAAkE,EAClE,UAA6C;;QAE7C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,UAAU,EAAE;YACvC,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,GAAY,EAAE;YAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,KAAK,MAAM,CAAC;QAC9C,CAAC,CAAC;QAEF,MAAM,eAAe,GAAG,GAAS,EAAE;YACjC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;gBAC9B,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;gBAChD,OAAO;aACR;YACD,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF,MAAM,aAAa,GAAG,GAAS,EAAE;YAC/B,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;gBAC7B,OAAO;aACR;YAED,QAAQ,IAAI,CAAC,KAAK,EAAE;gBAClB,KAAK,UAAU;oBACb,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,eAAe,CAAC;wBAC9C,eAAe,EAAE,IAAI,CAAC,QAAQ;wBAC9B,MAAM,EAAE,MAAuB;qBAChC,CAAC,CAAC;oBACH,MAAM;gBACR,KAAK,SAAS;oBACZ,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,cAAc,CAAC;wBAC7C,eAAe,EAAE,IAAI,CAAC,QAAQ;wBAC9B,MAAM,EAAE,MAAsB;qBAC/B,CAAC,CAAC;oBACH,MAAM;gBACR,KAAK,MAAM;oBACT,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,WAAW,CAAC;wBAC1C,eAAe,EAAE,IAAI,CAAC,QAAQ;wBAC9B,MAAM,EAAE,MAAoC;qBAC7C,CAAC,CAAC;oBACH,MAAM;gBACR;oBACE,MAAM,KAAK,CAAC,2BAA2B,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;aACxD;YACD,eAAe,EAAE,CAAC;QACpB,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG,GAAS,EAAE;;YAChC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1C,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO;aACR;YACD,OAAO,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAErD,2DAA2D;YAC3D,4DAA4D;YAC5D,0BAA0B;YAC1B,IACE,aAAA,IAAI,CAAC,QAAQ,CAAC,OAAO,0CAAE,UAAU,0CAAE,IAAI,OAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAA;gBAC5D,cAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,0CAAE,UAAU,0CAAE,MAAM,CAAA,EAC1C;gBACA,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAClC,KAAK,CAAC,KAAK,EAAE,CAAC;aACf;YAED,eAAe,EAAE,CAAC;QACpB,CAAC,CAAC;QAEF,MAAM,gBAAgB,GAAG,CAAC,UAAmB,IAAI,EAAQ,EAAE;YACzD,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACjD,IAAI,CAAC,WAAW,EAAE;gBAChB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAC7C,MAAM,EACN,eAAe,EACf,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,OAAO,CACR,CAAC;aACH;iBAAM;gBACL,qBAAqB,CACnB,WAAW,EACX,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,OAAO,EACP,eAAe,CAChB,CAAC;aACH;QACH,CAAC,CAAC;QAEF,MAAM,YAAY,GAAG,GAAY,EAAE;;YACjC,OAAO,CACL,IAAI,CAAC,QAAQ,CAAC,SAAS;gBACvB,OAAA,IAAI,CAAC,mBAAmB,0CAAE,EAAE,OAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,EAAE,CAAA,CAChD,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,YAAY,GAAG,KAAK,IAAmB,EAAE;YAC7C,IAAI,CAAC,QAAQ,CAAC,OAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;YAC/C,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC7B,CAAC,CAAC;QAEF,MAAM,aAAa,GAAG,KAAK,IAAmB,EAAE;YAC9C,IAAI,CAAC,QAAQ,CAAC,OAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;YAC/C,IAAI,CAAC,mBAAmB,GAAG,UAAU,CAAC;YACtC,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,IAAI,CAAC,QAAQ,CAAC,uBAAuB,EAAE,CAAC;QAChD,CAAC,CAAC;QAEF,MAAM,eAAe,GAAG,KAAK,IAAmB,EAAE;YAChD,wCAAwC;YACxC,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACf,OAAO;aACR;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAE,CAAC;YAClD,IAAI,YAAY,EAAE,EAAE;gBAClB,MAAM,YAAY,EAAE,CAAC;gBACrB,cAAc,EAAE,CAAC;gBACjB,qBAAqB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;aAC3C;iBAAM;gBACL,MAAM,aAAa,EAAE,CAAC;gBACtB,aAAa,EAAE,CAAC;gBAChB,qBAAqB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;aAC1C;QACH,CAAC,CAAC;QAEF,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACxB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACrE,IAAI,CAAC,gBAAgB,EAAE;YACrB,cAAc,EAAE,CAAC;YACjB,qBAAqB,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACnE,OAAO;SACR;QAED,kCAAkC;QAClC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;YAC1B,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;SAC9D;aAAM;YACL,IAAI,CAAC,mBAAmB,GAAG,OAAA,IAAI,CAAC,QAAQ,CAAC,OAAQ,CAAC,UAAU,0CAAE,MAAM,EAClE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU;gBAClC,CAAC,CAAC,IAAI,CAAC;YACT,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;SAC/C;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,EAAE;YACjE,MAAM,IAAI,CAAC,QAAQ,CAAC,uBAAuB,EAAE,CAAC;SAC/C;QAED,qBAAqB,CACnB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAE,EAC7B,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,IAAI,CACL,CAAC;QAEF,uCAAuC;QACvC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE;YAC5B,cAAc,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,SAAG,IAAI,CAAC,mBAAmB,mCAAI,UAAU,CAAC;YAC1E,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACxC,OAAO;SACR;QAED,uEAAuE;QACvE,aAAa,EAAE,CAAC;QAChB,IAAI,CAAC,mBAAmB,GAAG,UAAU,CAAC;QAEtC,iCAAiC;QACjC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1C,CAAC;CAgDF"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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"}

package/lib/handlers/editor.d.ts

@@ -1,5 +1,6 @@
 import { CodeEditor } from '@jupyterlab/codeeditor';
 import { IDisposable } from '@lumino/disposable';
+import { StateEffectType } from '@codemirror/state';
 import { IDebugger } from '../tokens';
 /**
  * A handler for a CodeEditor.IEditor.
@@ -11,6 +12,10 @@ export declare class EditorHandler implements IDisposable {
      * @param options The instantiation options for a EditorHandler.
      */
     constructor(options: EditorHandler.IOptions);
+    /**
+     * The editor
+     */
+    get editor(): CodeEditor.IEditor;
     /**
      * Whether the handler is disposed.
      */
@@ -19,6 +24,10 @@ export declare class EditorHandler implements IDisposable {
      * Dispose the handler.
      */
     dispose(): void;
+    /**
+     * Refresh the breakpoints display
+     */
+    refreshBreakpoints(): void;
     /**
      * Setup the editor.
      */
@@ -46,6 +55,7 @@ export declare class EditorHandler implements IDisposable {
      * Retrieve the breakpoints from the editor.
      */
     private _getBreakpointsFromEditor;
+    private _clearGutter;
     /**
      * Get the breakpoints for the editor using its content (code),
      * or its path (if it exists).
@@ -56,6 +66,11 @@ export declare class EditorHandler implements IDisposable {
     private _editor;
     private _debuggerService;
     private _editorMonitor;
+    private _breakpointEffect;
+    private _breakpointState;
+    private _gutter;
+    private _highlightDeco;
+    private _highlightState;
 }
 /**
  * A namespace for EditorHandler `statics`.
@@ -78,6 +93,9 @@ export declare namespace EditorHandler {
          */
         path?: string;
     }
+    const _highlightEffect: StateEffectType<{
+        pos: number[];
+    }>;
     /**
      * Highlight the current line of the frame in the given editor.
      *
@@ -91,10 +109,4 @@ export declare namespace EditorHandler {
      * @param editor The editor to cleanup.
      */
     function clearHighlight(editor: CodeEditor.IEditor): void;
-    /**
-     * Remove line numbers and all gutters from editor.
-     *
-     * @param editor The editor to cleanup.
-     */
-    function clearGutter(editor: CodeEditor.IEditor): void;
 }

package/lib/handlers/editor.js

@@ -2,6 +2,8 @@
 // Distributed under the terms of the Modified BSD License.
 import { ActivityMonitor } from '@jupyterlab/coreutils';
 import { Signal } from '@lumino/signaling';
+import { Compartment, Prec, RangeSet, StateEffect, StateField } from '@codemirror/state';
+import { Decoration, EditorView, gutter, GutterMarker } from '@codemirror/view';
 /**
  * The class name added to the current line.
  */
@@ -21,28 +23,6 @@ export class EditorHandler {
      */
     constructor(options) {
         var _a, _b, _c, _d;
-        /**
-         * Handle a click on the gutter.
-         *
-         * @param editor The editor from where the click originated.
-         * @param lineNumber The line corresponding to the click event.
-         */
-        this._onGutterClick = (editor, lineNumber) => {
-            var _a, _b, _c;
-            const info = editor.lineInfo(lineNumber);
-            if (!info || this._id !== ((_b = (_a = this._debuggerService.session) === null || _a === void 0 ? void 0 : _a.connection) === null || _b === void 0 ? void 0 : _b.id)) {
-                return;
-            }
-            const remove = !!info.gutterMarkers;
-            let breakpoints = this._getBreakpoints();
-            if (remove) {
-                breakpoints = breakpoints.filter(ele => ele.line !== info.line + 1);
-            }
-            else {
-                breakpoints.push(Private.createBreakpoint((_c = this._path) !== null && _c !== void 0 ? _c : this._debuggerService.session.connection.name, info.line + 1));
-            }
-            void this._debuggerService.updateBreakpoints(this._editor.model.value.text, breakpoints, this._path);
-        };
         this._id = (_c = (_b = (_a = options.debuggerService.session) === null || _a === void 0 ? void 0 : _a.connection) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : '';
         this._path = (_d = options.path) !== null && _d !== void 0 ? _d : '';
         this._debuggerService = options.debuggerService;
@@ -69,8 +49,65 @@ export class EditorHandler {
         this._debuggerService.model.callstack.currentFrameChanged.connect(() => {
             EditorHandler.clearHighlight(this._editor);
         });
+        this._breakpointEffect = StateEffect.define({
+            map: (value, mapping) => ({ pos: value.pos.map(v => mapping.mapPos(v)) })
+        });
+        this._breakpointState = StateField.define({
+            create: () => {
+                return RangeSet.empty;
+            },
+            update: (breakpoints, transaction) => {
+                breakpoints = breakpoints.map(transaction.changes);
+                for (let ef of transaction.effects) {
+                    if (ef.is(this._breakpointEffect)) {
+                        let e = ef;
+                        if (e.value.pos.length) {
+                            breakpoints = breakpoints.update({
+                                add: e.value.pos.map(v => Private.breakpointMarker.range(v)),
+                                sort: true
+                            });
+                        }
+                        else {
+                            breakpoints = RangeSet.empty;
+                        }
+                    }
+                }
+                return breakpoints;
+            }
+        });
+        this._gutter = new Compartment();
+        this._highlightDeco = Decoration.line({ class: LINE_HIGHLIGHT_CLASS });
+        this._highlightState = StateField.define({
+            create: () => {
+                return Decoration.none;
+            },
+            update: (highlights, transaction) => {
+                highlights = highlights.map(transaction.changes);
+                for (let ef of transaction.effects) {
+                    if (ef.is(EditorHandler._highlightEffect)) {
+                        let e = ef;
+                        if (e.value.pos.length) {
+                            highlights = highlights.update({
+                                add: e.value.pos.map(v => this._highlightDeco.range(v))
+                            });
+                        }
+                        else {
+                            highlights = Decoration.none;
+                        }
+                    }
+                }
+                return highlights;
+            },
+            provide: f => EditorView.decorations.from(f)
+        });
         this._setupEditor();
     }
+    /**
+     * The editor
+     */
+    get editor() {
+        return this._editor;
+    }
     /**
      * Dispose the handler.
      */
@@ -83,6 +120,12 @@ export class EditorHandler {
         this.isDisposed = true;
         Signal.clearData(this);
     }
+    /**
+     * Refresh the breakpoints display
+     */
+    refreshBreakpoints() {
+        this._addBreakpointsToEditor();
+    }
     /**
      * Setup the editor.
      */
@@ -90,14 +133,26 @@ export class EditorHandler {
         if (!this._editor || this._editor.isDisposed) {
             return;
         }
-        this._addBreakpointsToEditor();
         const editor = this._editor;
         editor.setOption('lineNumbers', true);
-        editor.editor.setOption('gutters', [
-            'CodeMirror-linenumbers',
-            'breakpoints'
-        ]);
-        editor.editor.on('gutterClick', this._onGutterClick);
+        const breakpointGutter = [
+            this._breakpointState,
+            this._highlightState,
+            Prec.highest(gutter({
+                class: 'cm-breakpoint-gutter',
+                renderEmptyElements: true,
+                markers: v => v.state.field(this._breakpointState),
+                initialSpacer: () => Private.breakpointMarker,
+                domEventHandlers: {
+                    mousedown: (view, line) => {
+                        this._onGutterClick(view, line.from);
+                        return true;
+                    }
+                }
+            }))
+        ];
+        editor.injectExtension(this._gutter.of(breakpointGutter));
+        this._addBreakpointsToEditor();
     }
     /**
      * Clear the editor by removing visual elements and handlers.
@@ -108,10 +163,11 @@ export class EditorHandler {
         }
         const editor = this._editor;
         EditorHandler.clearHighlight(editor);
-        EditorHandler.clearGutter(editor);
+        this._clearGutter(editor);
         editor.setOption('lineNumbers', false);
-        editor.editor.setOption('gutters', []);
-        editor.editor.off('gutterClick', this._onGutterClick);
+        editor.editor.dispatch({
+            effects: this._gutter.reconfigure([])
+        });
     }
     /**
      * Send the breakpoints from the editor UI via the debug service.
@@ -120,9 +176,38 @@ export class EditorHandler {
         if (this._editor.isDisposed) {
             return;
         }
-        const breakpoints = this._getBreakpointsFromEditor().map(lineInfo => {
+        const breakpoints = this._getBreakpointsFromEditor().map(lineNumber => {
             var _a, _b;
-            return Private.createBreakpoint(((_b = (_a = this._debuggerService.session) === null || _a === void 0 ? void 0 : _a.connection) === null || _b === void 0 ? void 0 : _b.name) || '', lineInfo.line + 1);
+            return Private.createBreakpoint(((_b = (_a = this._debuggerService.session) === null || _a === void 0 ? void 0 : _a.connection) === null || _b === void 0 ? void 0 : _b.name) || '', lineNumber);
+        });
+        void this._debuggerService.updateBreakpoints(this._editor.model.value.text, breakpoints, this._path);
+    }
+    /**
+     * Handle a click on the gutter.
+     *
+     * @param editor The editor from where the click originated.
+     * @param lineNumber The line corresponding to the click event.
+     */
+    _onGutterClick(editor, pos) {
+        var _a, _b, _c;
+        if (this._id !== ((_b = (_a = this._debuggerService.session) === null || _a === void 0 ? void 0 : _a.connection) === null || _b === void 0 ? void 0 : _b.id)) {
+            return;
+        }
+        const lineNumber = editor.state.doc.lineAt(pos).number;
+        let stateBreakpoints = editor.state.field(this._breakpointState);
+        let hasBreakpoint = false;
+        stateBreakpoints.between(pos, pos, () => {
+            hasBreakpoint = true;
+        });
+        let breakpoints = this._getBreakpoints();
+        if (hasBreakpoint) {
+            breakpoints = breakpoints.filter(ele => ele.line !== lineNumber);
+        }
+        else {
+            breakpoints.push(Private.createBreakpoint((_c = this._path) !== null && _c !== void 0 ? _c : this._debuggerService.session.connection.name, lineNumber));
+        }
+        breakpoints.sort((a, b) => {
+            return a.line - b.line;
         });
         void this._debuggerService.updateBreakpoints(this._editor.model.value.text, breakpoints, this._path);
     }
@@ -131,16 +216,17 @@ export class EditorHandler {
      */
     _addBreakpointsToEditor() {
         var _a, _b;
-        const editor = this._editor;
-        const breakpoints = this._getBreakpoints();
         if (this._id !== ((_b = (_a = this._debuggerService.session) === null || _a === void 0 ? void 0 : _a.connection) === null || _b === void 0 ? void 0 : _b.id)) {
             return;
         }
-        EditorHandler.clearGutter(editor);
-        breakpoints.forEach(breakpoint => {
-            if (typeof breakpoint.line === 'number') {
-                editor.editor.setGutterMarker(breakpoint.line - 1, 'breakpoints', Private.createMarkerNode());
-            }
+        const editor = this._editor;
+        const breakpoints = this._getBreakpoints();
+        this._clearGutter(editor);
+        const breakpointPos = breakpoints.map(b => {
+            return editor.state.doc.line(b.line).from;
+        });
+        editor.editor.dispatch({
+            effects: this._breakpointEffect.of({ pos: breakpointPos })
         });
     }
     /**
@@ -148,21 +234,29 @@ export class EditorHandler {
      */
     _getBreakpointsFromEditor() {
         const editor = this._editor;
+        const breakpoints = editor.editor.state.field(this._breakpointState);
         let lines = [];
-        for (let i = 0; i < editor.doc.lineCount(); i++) {
-            const info = editor.editor.lineInfo(i);
-            if (info.gutterMarkers) {
-                lines.push(info);
-            }
-        }
+        breakpoints.between(0, editor.doc.length, (from) => {
+            lines.push(editor.doc.lineAt(from).number);
+        });
         return lines;
     }
+    _clearGutter(editor) {
+        if (!editor) {
+            return;
+        }
+        const view = editor.editor;
+        view.dispatch({
+            effects: this._breakpointEffect.of({ pos: [] })
+        });
+    }
     /**
      * Get the breakpoints for the editor using its content (code),
      * or its path (if it exists).
      */
     _getBreakpoints() {
-        const code = this._editor.model.value.text;
+        const editor = this._editor;
+        const code = editor.doc.toString();
         return this._debuggerService.model.breakpoints.getBreakpoints(this._path || this._debuggerService.getCodeId(code));
     }
 }
@@ -170,6 +264,9 @@ export class EditorHandler {
  * A namespace for EditorHandler `statics`.
  */
 (function (EditorHandler) {
+    EditorHandler._highlightEffect = StateEffect.define({
+        map: (value, mapping) => ({ pos: value.pos.map(v => mapping.mapPos(v)) })
+    });
     /**
      * Highlight the current line of the frame in the given editor.
      *
@@ -179,8 +276,10 @@ export class EditorHandler {
     function showCurrentLine(editor, line) {
         clearHighlight(editor);
         const cmEditor = editor;
-        cmEditor.editor.addLineClass(line - 1, 'wrap', LINE_HIGHLIGHT_CLASS);
-        cmEditor.scrollIntoViewCentered({ ch: 0, line: line - 1 });
+        const linePos = cmEditor.doc.line(line).from;
+        cmEditor.editor.dispatch({
+            effects: EditorHandler._highlightEffect.of({ pos: [linePos] })
+        });
     }
     EditorHandler.showCurrentLine = showCurrentLine;
     /**
@@ -193,28 +292,11 @@ export class EditorHandler {
             return;
         }
         const cmEditor = editor;
-        cmEditor.doc.eachLine(line => {
-            cmEditor.editor.removeLineClass(line, 'wrap', LINE_HIGHLIGHT_CLASS);
+        cmEditor.editor.dispatch({
+            effects: EditorHandler._highlightEffect.of({ pos: [] })
         });
     }
     EditorHandler.clearHighlight = clearHighlight;
-    /**
-     * Remove line numbers and all gutters from editor.
-     *
-     * @param editor The editor to cleanup.
-     */
-    function clearGutter(editor) {
-        if (!editor) {
-            return;
-        }
-        const cmEditor = editor;
-        cmEditor.doc.eachLine(line => {
-            if (line.gutterMarkers) {
-                cmEditor.editor.setGutterMarker(line, 'breakpoints', null);
-            }
-        });
-    }
-    EditorHandler.clearGutter = clearGutter;
 })(EditorHandler || (EditorHandler = {}));
 /**
  * A namespace for module private data.
@@ -224,13 +306,12 @@ var Private;
     /**
      * Create a marker DOM element for a breakpoint.
      */
-    function createMarkerNode() {
-        const marker = document.createElement('div');
-        marker.className = 'jp-DebuggerEditor-marker';
-        marker.innerHTML = '●';
-        return marker;
-    }
-    Private.createMarkerNode = createMarkerNode;
+    Private.breakpointMarker = new (class extends GutterMarker {
+        toDOM() {
+            const marker = document.createTextNode('●');
+            return marker;
+        }
+    })();
     /**
      * Create a new breakpoint.
      *