@theia/debug 1.67.0-next.86 → 1.68.0-next.0

package/lib/browser/view/debug-threads-widget.js

@@ -21,6 +21,7 @@ const tslib_1 = require("tslib");
 const inversify_1 = require("@theia/core/shared/inversify");
 const browser_1 = require("@theia/core/lib/browser");
 const source_tree_1 = require("@theia/core/lib/browser/source-tree");
+const tree_expansion_1 = require("@theia/core/lib/browser/tree/tree-expansion");
 const debug_threads_source_1 = require("./debug-threads-source");
 const debug_session_1 = require("../debug-session");
 const debug_thread_1 = require("../model/debug-thread");
@@ -52,27 +53,90 @@ let DebugThreadsWidget = DebugThreadsWidget_1 = class DebugThreadsWidget extends
         this.title.label = nls_1.nls.localize('theia/debug/threads', 'Threads');
         this.toDispose.push(this.threads);
         this.source = this.threads;
-        this.toDispose.push(this.viewModel.onDidChange(() => this.updateWidgetSelection()));
+        this.toDispose.push(this.viewModel.onDidChange(() => {
+            this.updateWidgetSelection();
+        }));
         this.toDispose.push(this.model.onSelectionChanged(() => this.updateModelSelection()));
     }
-    updateWidgetSelection() {
+    async updateWidgetSelection() {
         if (this.updatingSelection) {
             return;
         }
         this.updatingSelection = true;
         try {
+            await this.model.refresh();
             const { currentThread } = this.viewModel;
-            if (currentThread) {
-                const node = this.model.getNode(currentThread.id);
-                if (browser_1.SelectableTreeNode.is(node)) {
+            // Check if current selection still exists in the tree
+            const selectedNode = this.model.selectedNodes[0];
+            const selectionStillValid = selectedNode && this.model.getNode(selectedNode.id);
+            // Only update selection if:
+            // 1. Current selection is invalid (node no longer in tree), OR
+            // 2. There's a stopped thread to show
+            if (selectionStillValid && (!currentThread || !currentThread.stopped)) {
+                return;
+            }
+            // Try to select the current stopped thread, or clear if none
+            if (currentThread && currentThread.stopped) {
+                const node = await this.waitForNode(currentThread);
+                // Re-check stopped state after async wait
+                if (!currentThread.stopped) {
+                    return;
+                }
+                if (node && browser_1.SelectableTreeNode.is(node)) {
                     this.model.selectNode(node);
+                    // Set context key
+                    if (source_tree_1.TreeElementNode.is(node)) {
+                        if (node.element instanceof debug_thread_1.DebugThread) {
+                            this.debugCallStackItemTypeKey.set('thread');
+                        }
+                        else if (node.element instanceof debug_session_1.DebugSession) {
+                            this.debugCallStackItemTypeKey.set('session');
+                        }
+                    }
                 }
             }
+            else if (!selectionStillValid) {
+                // Selection is stale and no stopped thread to select
+                this.model.clearSelection();
+            }
         }
         finally {
             this.updatingSelection = false;
         }
     }
+    /**
+     * Wait for a node to appear in the tree, expanding root children to populate the tree
+     */
+    async waitForNode(thread) {
+        const maxAttempts = 10;
+        const delayMs = 50;
+        const threadId = thread.id;
+        for (let attempt = 0; attempt < maxAttempts; attempt++) {
+            // If thread continued during wait, abort
+            if (!thread.stopped) {
+                return undefined;
+            }
+            await this.model.refresh();
+            const root = this.model.root;
+            // Expand all root's direct children to populate the tree
+            if (root && browser_1.CompositeTreeNode.is(root)) {
+                for (const child of root.children) {
+                    if (tree_expansion_1.ExpandableTreeNode.is(child) && !child.expanded) {
+                        await this.model.expandNode(child);
+                    }
+                }
+            }
+            // Now look directly for the thread node
+            const threadNode = this.model.getNode(threadId);
+            if (threadNode) {
+                return threadNode;
+            }
+            if (attempt < maxAttempts - 1) {
+                await new Promise(resolve => setTimeout(resolve, delayMs));
+            }
+        }
+        return undefined;
+    }
     updateModelSelection() {
         if (this.updatingSelection) {
             return;

package/lib/browser/view/debug-threads-widget.js.map

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

package/lib/browser/view/debug-toolbar-widget.d.ts

@@ -1,34 +1,21 @@
 /// <reference types="react" />
 import * as React from '@theia/core/shared/react';
-import { CommandMenu, CommandRegistry, DisposableCollection, MenuModelRegistry, MenuPath } from '@theia/core';
+import { CommandMenu, MenuModelRegistry, MenuPath } from '@theia/core';
+import { KeybindingRegistry } from '@theia/core/lib/browser';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { ReactWidget } from '@theia/core/lib/browser/widgets';
 import { DebugViewModel } from './debug-view-model';
-import { DebugAction } from './debug-action';
 export declare class DebugToolBar extends ReactWidget {
     static readonly MENU: MenuPath;
-    protected readonly commandRegistry: CommandRegistry;
+    static readonly CONTROLS: MenuPath;
     protected readonly menuModelRegistry: MenuModelRegistry;
+    protected readonly keybindingRegistry: KeybindingRegistry;
     protected readonly contextKeyService: ContextKeyService;
     protected readonly model: DebugViewModel;
-    protected readonly onRender: DisposableCollection;
     protected init(): void;
-    focus(): void;
-    protected doFocus(): boolean;
-    protected stepRef: DebugAction | undefined;
-    protected setStepRef: (stepRef: DebugAction | null) => void;
     protected render(): React.ReactNode;
     protected renderContributedCommands(): React.ReactNode;
     protected debugAction(commandMenuNode: CommandMenu): React.ReactNode;
-    protected renderStart(): React.ReactNode;
-    protected renderContinue(): React.ReactNode;
-    protected start: () => Promise<void>;
-    protected restart: () => Promise<void>;
-    protected stop: () => Promise<void>;
-    protected continue: () => Promise<import("@vscode/debugprotocol").DebugProtocol.ContinueResponse> | undefined;
-    protected pause: () => Promise<import("@vscode/debugprotocol").DebugProtocol.PauseResponse> | undefined;
-    protected stepOver: () => Promise<import("@vscode/debugprotocol").DebugProtocol.NextResponse> | undefined;
-    protected stepIn: () => Promise<import("@vscode/debugprotocol").DebugProtocol.StepInResponse> | undefined;
-    protected stepOut: () => Promise<import("@vscode/debugprotocol").DebugProtocol.StepOutResponse> | undefined;
+    protected acceleratorFor(commandId: string): string | undefined;
 }
 //# sourceMappingURL=debug-toolbar-widget.d.ts.map

package/lib/browser/view/debug-toolbar-widget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug-toolbar-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-toolbar-widget.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAgC,oBAAoB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5I,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,qBACa,YAAa,SAAQ,WAAW;IAEzC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAA0B;IAE/B,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC3D,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAEjE,SAAS,CAAC,QAAQ,CAAC,QAAQ,uBAA8B;IAGzD,SAAS,CAAC,IAAI,IAAI,IAAI;IAStB,KAAK,IAAI,IAAI;IAMb,SAAS,CAAC,OAAO,IAAI,OAAO;IAO5B,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IAC3C,SAAS,CAAC,UAAU,YAAa,WAAW,GAAG,IAAI,UAGjD;IAEF,SAAS,CAAC,MAAM,IAAI,KAAK,CAAC,SAAS;IAiBnC,SAAS,CAAC,yBAAyB,IAAI,KAAK,CAAC,SAAS;IAgBtD,SAAS,CAAC,WAAW,CAAC,eAAe,EAAE,WAAW,GAAG,KAAK,CAAC,SAAS;IASpE,SAAS,CAAC,WAAW,IAAI,KAAK,CAAC,SAAS;IAOxC,SAAS,CAAC,cAAc,IAAI,KAAK,CAAC,SAAS;IAQ3C,SAAS,CAAC,KAAK,sBAAmD;IAClE,SAAS,CAAC,OAAO,sBAA8B;IAC/C,SAAS,CAAC,IAAI,sBAAgC;IAC9C,SAAS,CAAC,QAAQ,4FAAyE;IAC3F,SAAS,CAAC,KAAK,yFAAsE;IACrF,SAAS,CAAC,QAAQ,wFAAyE;IAC3F,SAAS,CAAC,MAAM,0FAAuE;IACvF,SAAS,CAAC,OAAO,2FAAwE;CAE5F"}
+{"version":3,"file":"debug-toolbar-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-toolbar-widget.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,WAAW,EAAoB,iBAAiB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,qBACa,YAAa,SAAQ,WAAW;IAEzC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAA0B;IACxD,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAwC;IAE/C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACvD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAC3D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC3D,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAGjE,SAAS,CAAC,IAAI,IAAI,IAAI;IAUtB,SAAS,CAAC,MAAM,IAAI,KAAK,CAAC,SAAS;IAMnC,SAAS,CAAC,yBAAyB,IAAI,KAAK,CAAC,SAAS;IAgBtD,SAAS,CAAC,WAAW,CAAC,eAAe,EAAE,WAAW,GAAG,KAAK,CAAC,SAAS;IAYpE,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAKlE"}

package/lib/browser/view/debug-toolbar-widget.js

@@ -21,60 +21,23 @@ const tslib_1 = require("tslib");
 const React = require("@theia/core/shared/react");
 const inversify_1 = require("@theia/core/shared/inversify");
 const core_1 = require("@theia/core");
+const browser_1 = require("@theia/core/lib/browser");
 const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
 const widgets_1 = require("@theia/core/lib/browser/widgets");
 const debug_view_model_1 = require("./debug-view-model");
-const debug_session_1 = require("../debug-session");
 const debug_action_1 = require("./debug-action");
-const nls_1 = require("@theia/core/lib/common/nls");
 let DebugToolBar = DebugToolBar_1 = class DebugToolBar extends widgets_1.ReactWidget {
-    constructor() {
-        super(...arguments);
-        this.onRender = new core_1.DisposableCollection();
-        this.setStepRef = (stepRef) => {
-            this.stepRef = stepRef || undefined;
-            this.onRender.dispose();
-        };
-        this.start = () => this.model.start({ startedByUser: true });
-        this.restart = () => this.model.restart();
-        this.stop = () => this.model.terminate();
-        this.continue = () => this.model.currentThread && this.model.currentThread.continue();
-        this.pause = () => this.model.currentThread && this.model.currentThread.pause();
-        this.stepOver = () => this.model.currentThread && this.model.currentThread.stepOver();
-        this.stepIn = () => this.model.currentThread && this.model.currentThread.stepIn();
-        this.stepOut = () => this.model.currentThread && this.model.currentThread.stepOut();
-    }
     init() {
         this.id = 'debug:toolbar:' + this.model.id;
         this.addClass('debug-toolbar');
         this.toDispose.push(this.model);
         this.toDispose.push(this.model.onDidChange(() => this.update()));
+        this.toDispose.push(this.keybindingRegistry.onKeybindingsChanged(() => this.update()));
         this.scrollOptions = undefined;
         this.update();
     }
-    focus() {
-        if (!this.doFocus()) {
-            this.onRender.push(core_1.Disposable.create(() => this.doFocus()));
-            this.update();
-        }
-    }
-    doFocus() {
-        if (!this.stepRef) {
-            return false;
-        }
-        this.stepRef.focus();
-        return true;
-    }
     render() {
-        const { state } = this.model;
-        return React.createElement(React.Fragment, null,
-            this.renderContributedCommands(),
-            this.renderContinue(),
-            React.createElement(debug_action_1.DebugAction, { enabled: state === debug_session_1.DebugState.Stopped, run: this.stepOver, label: nls_1.nls.localizeByDefault('Step Over'), iconClass: 'debug-step-over', ref: this.setStepRef }),
-            React.createElement(debug_action_1.DebugAction, { enabled: state === debug_session_1.DebugState.Stopped, run: this.stepIn, label: nls_1.nls.localizeByDefault('Step Into'), iconClass: 'debug-step-into' }),
-            React.createElement(debug_action_1.DebugAction, { enabled: state === debug_session_1.DebugState.Stopped, run: this.stepOut, label: nls_1.nls.localizeByDefault('Step Out'), iconClass: 'debug-step-out' }),
-            React.createElement(debug_action_1.DebugAction, { enabled: state !== debug_session_1.DebugState.Inactive, run: this.restart, label: nls_1.nls.localizeByDefault('Restart'), iconClass: 'debug-restart' }),
-            this.renderStart());
+        return React.createElement(React.Fragment, null, this.renderContributedCommands());
     }
     renderContributedCommands() {
         const debugActions = [];
@@ -92,33 +55,26 @@ let DebugToolBar = DebugToolBar_1 = class DebugToolBar extends widgets_1.ReactWi
         return debugActions;
     }
     debugAction(commandMenuNode) {
-        return React.createElement(debug_action_1.DebugAction, { key: commandMenuNode.id, enabled: true, label: commandMenuNode.label, iconClass: commandMenuNode.icon || '', run: commandMenuNode.run });
+        const accelerator = this.acceleratorFor(commandMenuNode.id);
+        const run = (effectiveMenuPath) => commandMenuNode.run(effectiveMenuPath).catch(e => console.error(e));
+        return React.createElement(debug_action_1.DebugAction, { key: commandMenuNode.id, enabled: commandMenuNode.isEnabled(DebugToolBar_1.MENU), label: commandMenuNode.label, tooltip: commandMenuNode.label + (accelerator ? ` (${accelerator})` : ''), iconClass: commandMenuNode.icon || '', run: run });
     }
-    renderStart() {
-        const { state } = this.model;
-        if (state === debug_session_1.DebugState.Inactive && this.model.sessionCount === 1) {
-            return React.createElement(debug_action_1.DebugAction, { run: this.start, label: nls_1.nls.localizeByDefault('Start'), iconClass: 'debug-start' });
-        }
-        return React.createElement(debug_action_1.DebugAction, { enabled: state !== debug_session_1.DebugState.Inactive, run: this.stop, label: nls_1.nls.localizeByDefault('Stop'), iconClass: 'debug-stop' });
-    }
-    renderContinue() {
-        const { state } = this.model;
-        if (state === debug_session_1.DebugState.Stopped) {
-            return React.createElement(debug_action_1.DebugAction, { run: this.continue, label: nls_1.nls.localizeByDefault('Continue'), iconClass: 'debug-continue' });
-        }
-        return React.createElement(debug_action_1.DebugAction, { enabled: state === debug_session_1.DebugState.Running, run: this.pause, label: nls_1.nls.localizeByDefault('Pause'), iconClass: 'debug-pause' });
+    acceleratorFor(commandId) {
+        const keybindings = this.keybindingRegistry.getKeybindingsForCommand(commandId);
+        return keybindings.length ? this.keybindingRegistry.acceleratorFor(keybindings[0], '+').join(' ') : undefined;
     }
 };
 exports.DebugToolBar = DebugToolBar;
 DebugToolBar.MENU = ['debug-toolbar-menu'];
-tslib_1.__decorate([
-    (0, inversify_1.inject)(core_1.CommandRegistry),
-    tslib_1.__metadata("design:type", core_1.CommandRegistry)
-], DebugToolBar.prototype, "commandRegistry", void 0);
+DebugToolBar.CONTROLS = [...DebugToolBar_1.MENU, 'z_controls'];
 tslib_1.__decorate([
     (0, inversify_1.inject)(core_1.MenuModelRegistry),
     tslib_1.__metadata("design:type", core_1.MenuModelRegistry)
 ], DebugToolBar.prototype, "menuModelRegistry", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(browser_1.KeybindingRegistry),
+    tslib_1.__metadata("design:type", browser_1.KeybindingRegistry)
+], DebugToolBar.prototype, "keybindingRegistry", void 0);
 tslib_1.__decorate([
     (0, inversify_1.inject)(context_key_service_1.ContextKeyService),
     tslib_1.__metadata("design:type", Object)

package/lib/browser/view/debug-toolbar-widget.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug-toolbar-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-toolbar-widget.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"debug-toolbar-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-toolbar-widget.tsx"],"names":[],"mappings":"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"}

package/lib/browser/view/debug-view-model.d.ts.map

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

package/lib/browser/view/debug-view-model.js

@@ -81,14 +81,13 @@ let DebugViewModel = class DebugViewModel {
             this.fireDidChange();
         }));
         this.toDispose.push(this.manager.onDidChange(current => {
-            if (current === this.currentSession) {
-                this.fireDidChange();
-            }
+            // Always fire change to update views, even if session is not current
+            // This ensures threads view updates for all sessions
+            this.fireDidChange();
         }));
         this.toDispose.push(this.manager.onDidChangeBreakpoints(({ session, uri }) => {
-            if (!session || session === this.currentSession) {
-                this.fireDidChangeBreakpoints(uri);
-            }
+            // Fire for all sessions since we now show breakpoints from all active sessions
+            this.fireDidChangeBreakpoints(uri);
         }));
         this.toDispose.push(this.manager.onDidResolveLazyVariable(({ session, variable }) => {
             if (session === this.currentSession) {
@@ -121,13 +120,13 @@ let DebugViewModel = class DebugViewModel {
         return currentThread && currentThread.currentFrame;
     }
     get breakpoints() {
-        return this.manager.getBreakpoints(this.currentSession);
+        return this.manager.getBreakpoints();
     }
     get functionBreakpoints() {
-        return this.manager.getFunctionBreakpoints(this.currentSession);
+        return this.manager.getFunctionBreakpoints();
     }
     get instructionBreakpoints() {
-        return this.manager.getInstructionBreakpoints(this.currentSession);
+        return this.manager.getInstructionBreakpoints();
     }
     get dataBreakpoints() {
         return this.manager.getDataBreakpoints(this.currentSession);

package/lib/browser/view/debug-view-model.js.map

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

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@theia/debug",
-  "version": "1.67.0-next.86+03f92ff1d",
+  "version": "1.68.0-next.0+fa6de4563",
   "description": "Theia - Debug Extension",
   "dependencies": {
-    "@theia/console": "1.67.0-next.86+03f92ff1d",
-    "@theia/core": "1.67.0-next.86+03f92ff1d",
-    "@theia/editor": "1.67.0-next.86+03f92ff1d",
-    "@theia/filesystem": "1.67.0-next.86+03f92ff1d",
-    "@theia/markers": "1.67.0-next.86+03f92ff1d",
-    "@theia/monaco": "1.67.0-next.86+03f92ff1d",
+    "@theia/console": "1.68.0-next.0+fa6de4563",
+    "@theia/core": "1.68.0-next.0+fa6de4563",
+    "@theia/editor": "1.68.0-next.0+fa6de4563",
+    "@theia/filesystem": "1.68.0-next.0+fa6de4563",
+    "@theia/markers": "1.68.0-next.0+fa6de4563",
+    "@theia/monaco": "1.68.0-next.0+fa6de4563",
     "@theia/monaco-editor-core": "1.96.302",
-    "@theia/output": "1.67.0-next.86+03f92ff1d",
-    "@theia/process": "1.67.0-next.86+03f92ff1d",
-    "@theia/task": "1.67.0-next.86+03f92ff1d",
-    "@theia/terminal": "1.67.0-next.86+03f92ff1d",
-    "@theia/test": "1.67.0-next.86+03f92ff1d",
-    "@theia/variable-resolver": "1.67.0-next.86+03f92ff1d",
-    "@theia/workspace": "1.67.0-next.86+03f92ff1d",
+    "@theia/output": "1.68.0-next.0+fa6de4563",
+    "@theia/process": "1.68.0-next.0+fa6de4563",
+    "@theia/task": "1.68.0-next.0+fa6de4563",
+    "@theia/terminal": "1.68.0-next.0+fa6de4563",
+    "@theia/test": "1.68.0-next.0+fa6de4563",
+    "@theia/variable-resolver": "1.68.0-next.0+fa6de4563",
+    "@theia/workspace": "1.68.0-next.0+fa6de4563",
     "@vscode/debugprotocol": "^1.51.0",
     "fast-deep-equal": "^3.1.3",
     "jsonc-parser": "^2.2.0",
@@ -59,10 +59,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.66.0"
+    "@theia/ext-scripts": "1.67.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "03f92ff1d97dcb199de39b48e60a53535de22808"
+  "gitHead": "fa6de45637fb1cd821b642aa23e225abb1a13f06"
 }

package/src/browser/breakpoint/breakpoint-manager.ts

@@ -329,7 +329,7 @@ export class BreakpointManager extends MarkerManager<SourceBreakpoint> {
 
     removeDataBreakpoint(id: string): void {
         const index = this.dataBreakpoints.findIndex(bp => bp.id === id);
-        if (~index) { return; }
+        if (index < 0) { return; }
         const removed = this.dataBreakpoints.splice(index);
         this.fireOnDidChangeMarkers(BreakpointManager.DATA_URI);
         this.onDidChangeDataBreakpointsEmitter.fire({ uri: BreakpointManager.DATA_URI, added: [], removed, changed: [] });