@theia/debug 1.67.0-next.86 → 1.67.0

package/src/browser/view/debug-threads-widget.ts

@@ -16,8 +16,9 @@
 
 import { injectable, inject, postConstruct, interfaces, Container } from '@theia/core/shared/inversify';
 import { MenuPath } from '@theia/core';
-import { TreeNode, NodeProps, SelectableTreeNode } from '@theia/core/lib/browser';
+import { TreeNode, NodeProps, SelectableTreeNode, CompositeTreeNode } from '@theia/core/lib/browser';
 import { SourceTreeWidget, TreeElementNode } from '@theia/core/lib/browser/source-tree';
+import { ExpandableTreeNode } from '@theia/core/lib/browser/tree/tree-expansion';
 import { DebugThreadsSource } from './debug-threads-source';
 import { DebugSession } from '../debug-session';
 import { DebugThread } from '../model/debug-thread';
@@ -65,28 +66,105 @@ export class DebugThreadsWidget extends SourceTreeWidget {
         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()));
     }
 
     protected updatingSelection = false;
-    protected updateWidgetSelection(): void {
+    protected async updateWidgetSelection(): Promise<void> {
         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 (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 && SelectableTreeNode.is(node)) {
                     this.model.selectNode(node);
+
+                    // Set context key
+                    if (TreeElementNode.is(node)) {
+                        if (node.element instanceof DebugThread) {
+                            this.debugCallStackItemTypeKey.set('thread');
+                        } else if (node.element instanceof 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
+     */
+    protected async waitForNode(thread: DebugThread): Promise<TreeNode | undefined> {
+        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 && CompositeTreeNode.is(root)) {
+                for (const child of root.children) {
+                    if (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;
+    }
+
     protected updateModelSelection(): void {
         if (this.updatingSelection) {
             return;

package/src/browser/view/debug-toolbar-widget.tsx

@@ -16,69 +16,38 @@
 
 import * as React from '@theia/core/shared/react';
 import { inject, postConstruct, injectable } from '@theia/core/shared/inversify';
-import { CommandMenu, CommandRegistry, CompoundMenuNode, Disposable, DisposableCollection, MenuModelRegistry, MenuPath } from '@theia/core';
+import { CommandMenu, CompoundMenuNode, 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 { DebugState } from '../debug-session';
 import { DebugAction } from './debug-action';
-import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class DebugToolBar extends ReactWidget {
 
     static readonly MENU: MenuPath = ['debug-toolbar-menu'];
+    static readonly CONTROLS: MenuPath = [...DebugToolBar.MENU, 'z_controls'];
 
-    @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry;
     @inject(MenuModelRegistry) protected readonly menuModelRegistry: MenuModelRegistry;
+    @inject(KeybindingRegistry) protected readonly keybindingRegistry: KeybindingRegistry;
     @inject(ContextKeyService) protected readonly contextKeyService: ContextKeyService;
     @inject(DebugViewModel) protected readonly model: DebugViewModel;
 
-    protected readonly onRender = new DisposableCollection();
-
     @postConstruct()
     protected init(): void {
         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(): void {
-        if (!this.doFocus()) {
-            this.onRender.push(Disposable.create(() => this.doFocus()));
-            this.update();
-        }
-    }
-    protected doFocus(): boolean {
-        if (!this.stepRef) {
-            return false;
-        }
-        this.stepRef.focus();
-        return true;
-    }
-    protected stepRef: DebugAction | undefined;
-    protected setStepRef = (stepRef: DebugAction | null) => {
-        this.stepRef = stepRef || undefined;
-        this.onRender.dispose();
-    };
-
     protected render(): React.ReactNode {
-        const { state } = this.model;
         return <React.Fragment>
             {this.renderContributedCommands()}
-            {this.renderContinue()}
-            <DebugAction enabled={state === DebugState.Stopped} run={this.stepOver} label={nls.localizeByDefault('Step Over')}
-                iconClass='debug-step-over' ref={this.setStepRef} />
-            <DebugAction enabled={state === DebugState.Stopped} run={this.stepIn} label={nls.localizeByDefault('Step Into')}
-                iconClass='debug-step-into' />
-            <DebugAction enabled={state === DebugState.Stopped} run={this.stepOut} label={nls.localizeByDefault('Step Out')}
-                iconClass='debug-step-out' />
-            <DebugAction enabled={state !== DebugState.Inactive} run={this.restart} label={nls.localizeByDefault('Restart')}
-                iconClass='debug-restart' />
-            {this.renderStart()}
         </React.Fragment>;
     }
 
@@ -99,36 +68,20 @@ export class DebugToolBar extends ReactWidget {
     }
 
     protected debugAction(commandMenuNode: CommandMenu): React.ReactNode {
+        const accelerator = this.acceleratorFor(commandMenuNode.id);
+        const run = (effectiveMenuPath: MenuPath) => commandMenuNode.run(effectiveMenuPath).catch(e => console.error(e));
         return <DebugAction
             key={commandMenuNode.id}
-            enabled={true}
+            enabled={commandMenuNode.isEnabled(DebugToolBar.MENU)}
             label={commandMenuNode.label}
+            tooltip={commandMenuNode.label + (accelerator ? ` (${accelerator})` : '')}
             iconClass={commandMenuNode.icon || ''}
-            run={commandMenuNode.run} />;
+            run={run} />;
     }
 
-    protected renderStart(): React.ReactNode {
-        const { state } = this.model;
-        if (state === DebugState.Inactive && this.model.sessionCount === 1) {
-            return <DebugAction run={this.start} label={nls.localizeByDefault('Start')} iconClass='debug-start' />;
-        }
-        return <DebugAction enabled={state !== DebugState.Inactive} run={this.stop} label={nls.localizeByDefault('Stop')} iconClass='debug-stop' />;
-    }
-    protected renderContinue(): React.ReactNode {
-        const { state } = this.model;
-        if (state === DebugState.Stopped) {
-            return <DebugAction run={this.continue} label={nls.localizeByDefault('Continue')} iconClass='debug-continue' />;
-        }
-        return <DebugAction enabled={state === DebugState.Running} run={this.pause} label={nls.localizeByDefault('Pause')} iconClass='debug-pause' />;
+    protected acceleratorFor(commandId: string): string | undefined {
+        const keybindings = this.keybindingRegistry.getKeybindingsForCommand(commandId);
+        return keybindings.length ? this.keybindingRegistry.acceleratorFor(keybindings[0], '+').join(' ') : undefined;
     }
 
-    protected start = () => this.model.start({ startedByUser: true });
-    protected restart = () => this.model.restart();
-    protected stop = () => this.model.terminate();
-    protected continue = () => this.model.currentThread && this.model.currentThread.continue();
-    protected pause = () => this.model.currentThread && this.model.currentThread.pause();
-    protected stepOver = () => this.model.currentThread && this.model.currentThread.stepOver();
-    protected stepIn = () => this.model.currentThread && this.model.currentThread.stepIn();
-    protected stepOut = () => this.model.currentThread && this.model.currentThread.stepOut();
-
 }

package/src/browser/view/debug-view-model.ts

@@ -96,14 +96,13 @@ export class DebugViewModel implements Disposable {
             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) {
@@ -140,15 +139,15 @@ export class DebugViewModel implements Disposable {
     }
 
     get breakpoints(): DebugSourceBreakpoint[] {
-        return this.manager.getBreakpoints(this.currentSession);
+        return this.manager.getBreakpoints();
     }
 
     get functionBreakpoints(): DebugFunctionBreakpoint[] {
-        return this.manager.getFunctionBreakpoints(this.currentSession);
+        return this.manager.getFunctionBreakpoints();
     }
 
     get instructionBreakpoints(): DebugInstructionBreakpoint[] {
-        return this.manager.getInstructionBreakpoints(this.currentSession);
+        return this.manager.getInstructionBreakpoints();
     }
 
     get dataBreakpoints(): DebugDataBreakpoint[] {