@theia/debug 1.67.0-next.59 → 1.67.0

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-variables-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug-variables-source.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-variables-source.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,qBACa,oBAAqB,SAAQ,UAAU;IAGhD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAGzC,SAAS,CAAC,IAAI,IAAI,IAAI;IAKtB,SAAS,CAAC,QAAQ,CAAC,OAAO,sBAA6C;IAEjE,WAAW,IAAI,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;CAM7D"}
+{"version":3,"file":"debug-variables-source.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-variables-source.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,qBACa,oBAAqB,SAAQ,UAAU;IAGhD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAGzC,SAAS,CAAC,IAAI,IAAI,IAAI;IAMtB,SAAS,CAAC,QAAQ,CAAC,OAAO,sBAA6C;IAEjE,WAAW,IAAI,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;CAM7D"}

package/lib/browser/view/debug-variables-source.js

@@ -29,6 +29,7 @@ let DebugVariablesSource = class DebugVariablesSource extends source_tree_1.Tree
     init() {
         this.refresh();
         this.toDispose.push(this.model.onDidChange(() => this.refresh()));
+        this.toDispose.push(this.model.onDidResolveLazyVariable(() => this.fireDidChange()));
     }
     async getElements() {
         const { currentSession } = this.model;

package/lib/browser/view/debug-variables-source.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug-variables-source.js","sourceRoot":"","sources":["../../../src/browser/view/debug-variables-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAiF;AACjF,qEAAiE;AAEjE,yDAAoD;AACpD,uCAAwC;AAGjC,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,wBAAU;IAA7C;;QAWgB,YAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,GAAG,CAAC,CAAC;IAQ3E,CAAC;IAba,IAAI;QACV,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAID,KAAK,CAAC,WAAW;QACb,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IACrC,CAAC;CAEJ,CAAA;AAnBY,oDAAoB;AAGV;IADlB,IAAA,kBAAM,EAAC,iCAAc,CAAC;sCACG,iCAAc;mDAAC;AAG/B;IADT,IAAA,yBAAa,GAAE;;;;gDAIf;+BATQ,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAmBhC"}
+{"version":3,"file":"debug-variables-source.js","sourceRoot":"","sources":["../../../src/browser/view/debug-variables-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAiF;AACjF,qEAAiE;AAEjE,yDAAoD;AACpD,uCAAwC;AAGjC,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,wBAAU;IAA7C;;QAYgB,YAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,GAAG,CAAC,CAAC;IAQ3E,CAAC;IAda,IAAI;QACV,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzF,CAAC;IAID,KAAK,CAAC,WAAW;QACb,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IACrC,CAAC;CAEJ,CAAA;AApBY,oDAAoB;AAGV;IADlB,IAAA,kBAAM,EAAC,iCAAc,CAAC;sCACG,iCAAc;mDAAC;AAG/B;IADT,IAAA,yBAAa,GAAE;;;;gDAKf;+BAVQ,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAoBhC"}

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

@@ -7,6 +7,9 @@ import { DebugViewModel } from './debug-view-model';
 import { MouseEvent } from '@theia/core/shared/react';
 import { TreeNode } from '@theia/core/lib/browser';
 import { BreakpointManager } from '../breakpoint/breakpoint-manager';
+import { DebugSessionManager } from '../debug-session-manager';
+import { DebugSession } from '../debug-session';
+import { DebugStackFrame } from '../model/debug-stack-frame';
 export declare class DebugVariablesWidget extends SourceTreeWidget {
     static CONTEXT_MENU: MenuPath;
     static EDIT_MENU: MenuPath;
@@ -20,9 +23,21 @@ export declare class DebugVariablesWidget extends SourceTreeWidget {
     protected readonly commandRegistry: CommandRegistry;
     protected readonly menuRegistry: MenuModelRegistry;
     protected readonly breakpointManager: BreakpointManager;
+    protected readonly sessionManager: DebugSessionManager;
+    protected stackFrame: DebugStackFrame | undefined;
+    protected readonly statePerSession: Map<string, DebugVariablesWidgetSessionState>;
     protected init(): void;
+    protected handleDidFocusStackFrame(stackFrame: DebugStackFrame | undefined): void;
+    protected getOrCreateSessionState(session: DebugSession): DebugVariablesWidgetSessionState;
+    protected newSessionState(): DebugVariablesWidgetSessionState;
+    protected handleDidDestroyDebugSession(session: DebugSession): void;
     protected handleContextMenuEvent(node: TreeNode | undefined, event: MouseEvent<HTMLElement>): void;
     protected doHandleContextMenuEvent(node: TreeNode | undefined, event: MouseEvent<HTMLElement>): Promise<void>;
     protected getVariableCommands(node: TreeElementNode): Promise<Disposable>;
 }
+export declare class DebugVariablesWidgetSessionState {
+    protected readonly statePerStackFrame: Map<string, object>;
+    setStateForStackFrame(stackFrame: DebugStackFrame, state: object): void;
+    getStateForStackFrame(stackFrame: DebugStackFrame): object | undefined;
+}
 //# sourceMappingURL=debug-variables-widget.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"debug-variables-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-variables-widget.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAqC,UAAU,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACxG,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,EAAE,iBAAiB,EAAiC,MAAM,wBAAwB,CAAC;AACjI,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAsB,QAAQ,EAAiB,MAAM,yBAAyB,CAAC;AAEtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAGrE,qBACa,oBAAqB,SAAQ,gBAAgB;IAEtD,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAoC;IACjE,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAoD;IAC9E,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAqD;IAChF,MAAM,CAAC,oBAAoB,EAAE,QAAQ,CAAgE;IACrG,MAAM,CAAC,UAAU,SAAqB;WACtB,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,SAAS;IAWxE,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,oBAAoB;IAKvE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;cAGrC,IAAI,IAAI,IAAI;cAQZ,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,IAAI;cAI3F,wBAAwB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;cA0BnG,mBAAmB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC;CAoDlF"}
+{"version":3,"file":"debug-variables-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-variables-widget.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAqC,UAAU,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACxG,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,EAAE,iBAAiB,EAAiC,MAAM,wBAAwB,CAAC;AACjI,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAsB,QAAQ,EAAiB,MAAM,yBAAyB,CAAC;AAEtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,qBACa,oBAAqB,SAAQ,gBAAgB;IAEtD,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAoC;IACjE,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAoD;IAC9E,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAqD;IAChF,MAAM,CAAC,oBAAoB,EAAE,QAAQ,CAAgE;IACrG,MAAM,CAAC,UAAU,SAAqB;WACtB,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,SAAS;IAWxE,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,oBAAoB;IAKvE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;IAEvD,SAAS,CAAC,UAAU,EAAE,eAAe,GAAG,SAAS,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,eAAe,gDAAuD;cAGtE,IAAI,IAAI,IAAI;IAU/B,SAAS,CAAC,wBAAwB,CAAC,UAAU,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAmBjF,SAAS,CAAC,uBAAuB,CAAC,OAAO,EAAE,YAAY,GAAG,gCAAgC;IAS1F,SAAS,CAAC,eAAe,IAAI,gCAAgC;IAI7D,SAAS,CAAC,4BAA4B,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;cAIhD,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,IAAI;cAI3F,wBAAwB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;cA0BnG,mBAAmB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC;CAoDlF;AAED,qBAAa,gCAAgC;IACzC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,sBAA6B;IAElE,qBAAqB,CAAC,UAAU,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAIvE,qBAAqB,CAAC,UAAU,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS;CAGzE"}

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

@@ -16,7 +16,7 @@
 // *****************************************************************************
 var DebugVariablesWidget_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DebugVariablesWidget = void 0;
+exports.DebugVariablesWidgetSessionState = exports.DebugVariablesWidget = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("@theia/core/shared/inversify");
 const common_1 = require("@theia/core/lib/common");
@@ -28,7 +28,12 @@ const browser_1 = require("@theia/core/lib/browser");
 const debug_console_items_1 = require("../console/debug-console-items");
 const breakpoint_manager_1 = require("../breakpoint/breakpoint-manager");
 const breakpoint_marker_1 = require("../breakpoint/breakpoint-marker");
+const debug_session_manager_1 = require("../debug-session-manager");
 let DebugVariablesWidget = DebugVariablesWidget_1 = class DebugVariablesWidget extends source_tree_1.SourceTreeWidget {
+    constructor() {
+        super(...arguments);
+        this.statePerSession = new Map();
+    }
     static createContainer(parent) {
         const child = source_tree_1.SourceTreeWidget.createContainer(parent, {
             contextMenuPath: DebugVariablesWidget_1.CONTEXT_MENU,
@@ -49,6 +54,40 @@ let DebugVariablesWidget = DebugVariablesWidget_1 = class DebugVariablesWidget e
         this.title.label = nls_1.nls.localizeByDefault('Variables');
         this.toDispose.push(this.variables);
         this.source = this.variables;
+        this.toDispose.push(this.sessionManager.onDidFocusStackFrame(stackFrame => this.handleDidFocusStackFrame(stackFrame)));
+        this.toDispose.push(this.sessionManager.onDidDestroyDebugSession(session => this.handleDidDestroyDebugSession(session)));
+    }
+    handleDidFocusStackFrame(stackFrame) {
+        if (this.stackFrame !== stackFrame) {
+            if (this.stackFrame) {
+                const sessionState = this.getOrCreateSessionState(this.stackFrame.session);
+                sessionState.setStateForStackFrame(this.stackFrame, this.superStoreState());
+            }
+            if (stackFrame) {
+                const sessionState = this.statePerSession.get(stackFrame.session.id);
+                if (sessionState) {
+                    const state = sessionState.getStateForStackFrame(stackFrame);
+                    if (state) {
+                        this.superRestoreState(state);
+                    }
+                }
+            }
+            this.stackFrame = stackFrame;
+        }
+    }
+    getOrCreateSessionState(session) {
+        let sessionState = this.statePerSession.get(session.id);
+        if (!sessionState) {
+            sessionState = this.newSessionState();
+            this.statePerSession.set(session.id, sessionState);
+        }
+        return sessionState;
+    }
+    newSessionState() {
+        return new DebugVariablesWidgetSessionState();
+    }
+    handleDidDestroyDebugSession(session) {
+        this.statePerSession.delete(session.id);
     }
     handleContextMenuEvent(node, event) {
         this.doHandleContextMenuEvent(node, event);
@@ -140,6 +179,10 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(breakpoint_manager_1.BreakpointManager),
     tslib_1.__metadata("design:type", breakpoint_manager_1.BreakpointManager)
 ], DebugVariablesWidget.prototype, "breakpointManager", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(debug_session_manager_1.DebugSessionManager),
+    tslib_1.__metadata("design:type", debug_session_manager_1.DebugSessionManager)
+], DebugVariablesWidget.prototype, "sessionManager", void 0);
 tslib_1.__decorate([
     (0, inversify_1.postConstruct)(),
     tslib_1.__metadata("design:type", Function),
@@ -149,4 +192,16 @@ tslib_1.__decorate([
 exports.DebugVariablesWidget = DebugVariablesWidget = DebugVariablesWidget_1 = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], DebugVariablesWidget);
+class DebugVariablesWidgetSessionState {
+    constructor() {
+        this.statePerStackFrame = new Map();
+    }
+    setStateForStackFrame(stackFrame, state) {
+        this.statePerStackFrame.set(stackFrame.id, state);
+    }
+    getStateForStackFrame(stackFrame) {
+        return this.statePerStackFrame.get(stackFrame.id);
+    }
+}
+exports.DebugVariablesWidgetSessionState = DebugVariablesWidgetSessionState;
 //# sourceMappingURL=debug-variables-widget.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"debug-variables-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-variables-widget.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;AAEhF,4DAAwG;AACxG,mDAAiI;AACjI,qEAAwF;AACxF,qEAAgE;AAChE,yDAAoD;AACpD,oDAAiD;AAEjD,qDAAsF;AACtF,wEAA+D;AAC/D,yEAAqE;AACrE,uEAAiH;AAG1G,IAAM,oBAAoB,4BAA1B,MAAM,oBAAqB,SAAQ,8BAAgB;IAOtD,MAAM,CAAU,eAAe,CAAC,MAA4B;QACxD,MAAM,KAAK,GAAG,8BAAgB,CAAC,eAAe,CAAC,MAAM,EAAE;YACnD,eAAe,EAAE,sBAAoB,CAAC,YAAY;YAClD,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,6CAAoB,CAAC,CAAC,MAAM,EAAE,CAAC;QAC1C,KAAK,CAAC,MAAM,CAAC,8BAAgB,CAAC,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,sBAAoB,CAAC,CAAC,MAAM,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,CAAC,YAAY,CAAC,MAA4B;QAC5C,OAAO,sBAAoB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,sBAAoB,CAAC,CAAC;IAClF,CAAC;IAkBkB,IAAI;QACnB,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,EAAE,GAAG,sBAAoB,CAAC,UAAU,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QACpE,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,SAAG,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC;IACjC,CAAC;IAEkB,sBAAsB,CAAC,IAA0B,EAAE,KAA8B;QAChG,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAES,KAAK,CAAC,wBAAwB,CAAC,IAA0B,EAAE,KAA8B;QAC/F,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,IAAI,CAAC,4BAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,6BAAe,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAC1E,0IAA0I;QAC1I,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5C,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,uBAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,uBAAa,CAAC,aAAa,CAAC,OAAO,CAAC;YAC/I,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;QACnD,IAAI,eAAe,EAAE,CAAC;YAClB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC;YACnC,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC;YACnC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAC7D,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;gBAC7C,QAAQ,EAAE,eAAe;gBACzB,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE;gBAChB,IAAI;gBACJ,MAAM,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE;aAC1C,CAAC,EAAE,EAAE,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;IAES,KAAK,CAAC,mBAAmB,CAAC,IAAqB;QACrD,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC;QACrC,MAAM,EAAE,SAAS,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,IAAI,CAAC;QAC/C,IAAI,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,YAAY,CAAC,uBAAuB,CAAA,IAAI,CAAC,CAAC,eAAe,YAAY,mCAAa,CAAC,EAAE,CAAC;YACvG,OAAO,mBAAU,CAAC,IAAI,CAAC;QAC3B,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,eAAe,CAAC;QACxD,MAAM,kBAAkB,GAAG,CAAC,MAAM,cAAc,CAAC,WAAW,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAClI,2CAA2C;QAC3C,IAAI,kBAAkB,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YACrC,OAAO,mBAAU,CAAC,IAAI,CAAC;QAC3B,CAAC;QACD,MAAM,MAAM,GAAyB,EAAE,IAAI,2CAAmC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACjG,OAAO,IAAI,6BAAoB,CAC3B,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,gBAAO,CAAC,yBAAyB,CAAC;YACnE,EAAE,EAAE,mBAAmB,cAAc,CAAC,EAAE,IAAI,IAAI,EAAE;YAClD,KAAK,EAAE,uBAAuB;SACjC,CAAC,EAAE;YACA,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,kCAAc,CAAC,MAAM,CACzE,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,kBAAkB,CAAC,MAAO,EAAE,EAC/D,kBAAkB,EAClB,MAAM,CACT,CAAC;YACF,SAAS,EAAE,GAAG,EAAE,WAAC,OAAA,CAAC,CAAC,CAAA,MAAA,kBAAkB,CAAC,WAAW,0CAAE,QAAQ,CAAC,WAAW,CAAC,CAAA,CAAA,EAAA;SAC3E,CAAC,EACF,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,sBAAoB,CAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,mBAAmB,cAAc,CAAC,EAAE,IAAI,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAC1J,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,gBAAO,CAAC,yBAAyB,CAAC;YACnE,EAAE,EAAE,iBAAiB,cAAc,CAAC,EAAE,IAAI,IAAI,EAAE;YAChD,KAAK,EAAE,qBAAqB;SAC/B,CAAC,EAAE;YACA,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,kCAAc,CAAC,MAAM,CACzE,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,CAAC,MAAO,EAAE,EAC1D,kBAAkB,EAClB,MAAM,CACT,CAAC;YACF,SAAS,EAAE,GAAG,EAAE,WAAC,OAAA,CAAC,CAAC,CAAA,MAAA,kBAAkB,CAAC,WAAW,0CAAE,QAAQ,CAAC,MAAM,CAAC,CAAA,CAAA,EAAA;SACtE,CAAC,EACF,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,sBAAoB,CAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,iBAAiB,cAAc,CAAC,EAAE,IAAI,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EACxJ,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,gBAAO,CAAC,yBAAyB,CAAC;YACnE,EAAE,EAAE,kBAAkB,cAAc,CAAC,EAAE,IAAI,IAAI,EAAE;YACjD,KAAK,EAAE,uBAAuB;SACjC,CAAC,EAAE;YACA,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,kCAAc,CAAC,MAAM,CACzE,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,kBAAkB,CAAC,MAAO,EAAE,EAC3D,kBAAkB,EAClB,MAAM,CACT,CAAC;YACF,SAAS,EAAE,GAAG,EAAE,WAAC,OAAA,CAAC,CAAC,CAAA,MAAA,kBAAkB,CAAC,WAAW,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,CAAA,EAAA;SACvE,CAAC,EACF,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,sBAAoB,CAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,kBAAkB,cAAc,CAAC,EAAE,IAAI,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAC5J,CAAC;IACN,CAAC;;AA/HQ,oDAAoB;AAEtB,iCAAY,GAAa,CAAC,8BAA8B,CAAC,AAA7C,CAA8C;AAC1D,8BAAS,GAAa,CAAC,GAAG,sBAAoB,CAAC,YAAY,EAAE,QAAQ,CAAC,AAA7D,CAA8D;AACvE,+BAAU,GAAa,CAAC,GAAG,sBAAoB,CAAC,YAAY,EAAE,SAAS,CAAC,AAA9D,CAA+D;AACzE,yCAAoB,GAAa,CAAC,GAAG,sBAAoB,CAAC,YAAY,EAAE,oBAAoB,CAAC,AAAzE,CAA0E;AAC9F,+BAAU,GAAG,iBAAiB,AAApB,CAAqB;AAiBnB;IADlB,IAAA,kBAAM,EAAC,iCAAc,CAAC;sCACO,iCAAc;uDAAC;AAG1B;IADlB,IAAA,kBAAM,EAAC,6CAAoB,CAAC;sCACC,6CAAoB;uDAAC;AAGhC;IADlB,IAAA,kBAAM,EAAC,wBAAe,CAAC;sCACY,wBAAe;6DAAC;AAGjC;IADlB,IAAA,kBAAM,EAAC,0BAAiB,CAAC;sCACO,0BAAiB;0DAAC;AAGhC;IADlB,IAAA,kBAAM,EAAC,sCAAiB,CAAC;sCACY,sCAAiB;+DAAC;AAGrC;IADlB,IAAA,yBAAa,GAAE;;;;gDAOf;+BA5CQ,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAgIhC"}
+{"version":3,"file":"debug-variables-widget.js","sourceRoot":"","sources":["../../../src/browser/view/debug-variables-widget.ts"],"names":[],"mappings":"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"}

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

@@ -11,6 +11,7 @@ import { DebugFunctionBreakpoint } from '../model/debug-function-breakpoint';
 import { DebugInstructionBreakpoint } from '../model/debug-instruction-breakpoint';
 import { DebugSessionOptionsBase } from '../debug-session-options';
 import { DebugDataBreakpoint } from '../model/debug-data-breakpoint';
+import { DebugVariable } from '../console/debug-console-items';
 export declare class DebugViewModel implements Disposable {
     protected readonly onDidChangeEmitter: Emitter<void>;
     readonly onDidChange: Event<void>;
@@ -18,6 +19,9 @@ export declare class DebugViewModel implements Disposable {
     protected readonly onDidChangeBreakpointsEmitter: Emitter<URI>;
     readonly onDidChangeBreakpoints: Event<URI>;
     protected fireDidChangeBreakpoints(uri: URI): void;
+    protected readonly onDidResolveLazyVariableEmitter: Emitter<DebugVariable>;
+    readonly onDidResolveLazyVariable: Event<DebugVariable>;
+    protected fireDidResolveLazyVariable(variable: DebugVariable): void;
     protected readonly _watchExpressions: Map<number, DebugWatchExpression>;
     protected readonly onDidChangeWatchExpressionsEmitter: Emitter<void>;
     readonly onDidChangeWatchExpressions: Event<void>;

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

@@ -30,10 +30,12 @@ let DebugViewModel = class DebugViewModel {
         this.onDidChange = this.onDidChangeEmitter.event;
         this.onDidChangeBreakpointsEmitter = new common_1.Emitter();
         this.onDidChangeBreakpoints = this.onDidChangeBreakpointsEmitter.event;
+        this.onDidResolveLazyVariableEmitter = new common_1.Emitter();
+        this.onDidResolveLazyVariable = this.onDidResolveLazyVariableEmitter.event;
         this._watchExpressions = new Map();
         this.onDidChangeWatchExpressionsEmitter = new common_1.Emitter();
         this.onDidChangeWatchExpressions = this.onDidChangeWatchExpressionsEmitter.event;
-        this.toDispose = new common_1.DisposableCollection(this.onDidChangeEmitter, this.onDidChangeBreakpointsEmitter, this.onDidChangeWatchExpressionsEmitter);
+        this.toDispose = new common_1.DisposableCollection(this.onDidChangeEmitter, this.onDidChangeBreakpointsEmitter, this.onDidResolveLazyVariableEmitter, this.onDidChangeWatchExpressionsEmitter);
         this.refreshWatchExpressionsQueue = Promise.resolve();
         this.refreshWatchExpressions = (0, p_debounce_1.default)(() => {
             this.refreshWatchExpressionsQueue = this.refreshWatchExpressionsQueue.then(async () => {
@@ -53,6 +55,9 @@ let DebugViewModel = class DebugViewModel {
     fireDidChangeBreakpoints(uri) {
         this.onDidChangeBreakpointsEmitter.fire(uri);
     }
+    fireDidResolveLazyVariable(variable) {
+        this.onDidResolveLazyVariableEmitter.fire(variable);
+    }
     fireDidChangeWatchExpressions() {
         this.onDidChangeWatchExpressionsEmitter.fire(undefined);
     }
@@ -76,13 +81,17 @@ 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) {
+                this.fireDidResolveLazyVariable(variable);
             }
         }));
         this.updateWatchExpressions();
@@ -111,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":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,2CAAkC;AAClC,4DAAiF;AACjF,mDAA0G;AAE1G,oDAA4D;AAC5D,oEAA+D;AAI/D,qEAAgE;AAChE,gEAA2D;AAOpD,IAAM,cAAc,GAApB,MAAM,cAAc;IAApB;QAEgB,uBAAkB,GAAG,IAAI,gBAAO,EAAQ,CAAC;QACnD,gBAAW,GAAgB,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;QAM/C,kCAA6B,GAAG,IAAI,gBAAO,EAAO,CAAC;QAC7D,2BAAsB,GAAe,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC;QAKpE,sBAAiB,GAAG,IAAI,GAAG,EAAgC,CAAC;QAE5D,uCAAkC,GAAG,IAAI,gBAAO,EAAQ,CAAC;QACnE,gCAA2B,GAAG,IAAI,CAAC,kCAAkC,CAAC,KAAK,CAAC;QAKlE,cAAS,GAAG,IAAI,6BAAoB,CACnD,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,6BAA6B,EAClC,IAAI,CAAC,kCAAkC,CAC1C,CAAC;QAmKQ,iCAA4B,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QACjD,4BAAuB,GAAG,IAAA,oBAAQ,EAAC,GAAG,EAAE;YAC9C,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;gBAClF,IAAI,CAAC;oBACD,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBACtF,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,EAAE,EAAE,CAAC,CAAC;IAEX,CAAC;IArMa,aAAa;QACnB,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/B,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAIS,wBAAwB,CAAC,GAAQ;QACvC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC;IAMS,6BAA6B;QACnC,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAcD,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IACpD,CAAC;IACD,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IACxC,CAAC;IACD,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACD,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,IAAI,CAAC;IACnD,CAAC;IACD,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,YAAG,CAAC,QAAQ,CAAC,4BAA4B,EAAE,iBAAiB,CAAC,CAAC;IAC/G,CAAC;IAGS,IAAI;QACV,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,GAAG,EAAE;YAChE,IAAI,CAAC,aAAa,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACnD,IAAI,OAAO,KAAK,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClC,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,CAAC;QACL,CAAC,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;YACzE,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,IAAI,CAAC,cAAc,EAAE,CAAC;gBAC9C,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;YACvC,CAAC;QACL,CAAC,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,cAAc;QACd,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACxC,OAAO,cAAc,CAAC;IAC1B,CAAC;IACD,IAAI,cAAc,CAAC,cAAwC;QACvD,IAAI,CAAC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;IACjD,CAAC;IAED,IAAI,KAAK;QACL,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QAChC,OAAO,cAAc,IAAI,cAAc,CAAC,KAAK,IAAI,0BAAU,CAAC,QAAQ,CAAC;IACzE,CAAC;IACD,IAAI,aAAa;QACb,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QAChC,OAAO,cAAc,IAAI,cAAc,CAAC,aAAa,CAAC;IAC1D,CAAC;IACD,IAAI,YAAY;QACZ,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;QAC/B,OAAO,aAAa,IAAI,aAAa,CAAC,YAAY,CAAC;IACvD,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,mBAAmB;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,sBAAsB;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,UAAmE,EAAE;QAC7E,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO;QACX,CAAC;QACD,MAAM,WAAW,GAAG,IAAA,kBAAS,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;QACjF,IAAI,UAAU,EAAE,CAAC;YACb,IAAI,CAAC,aAAa,EAAE,CAAC;QACzB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO;QACX,CAAC;QACD,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,SAAS;QACX,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,gBAAgB;QAChB,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,aAAqB,EAAE;QAC5C,MAAM,eAAe,GAAyB,IAAI,6CAAoB,CAAC;YACnE,EAAE,EAAE,MAAM,CAAC,gBAAgB;YAC3B,UAAU;YACV,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc;YAClC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC;YACzD,WAAW,EAAE,GAAG,EAAE,GAAe,CAAC;SACrC,CAAC,CAAC;QACH,MAAM,eAAe,CAAC,IAAI,EAAE,CAAC;QAC7B,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;YAC9B,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,sBAAsB;QAClB,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC;IACxC,CAAC;IAED,qBAAqB,CAAC,UAAgC;QAClD,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;IAES,sBAAsB;QAC5B,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;QACxD,KAAK,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YACzD,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAClC,KAAK,GAAG,IAAI,CAAC;gBACb,MAAM,eAAe,GAAyB,IAAI,6CAAoB,CAAC;oBACnE,EAAE;oBACF,UAAU;oBACV,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc;oBAClC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC;oBACzD,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,6BAA6B,EAAE;iBAC1D,CAAC,CAAC;gBACH,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;gBAChD,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC/B,CAAC;QACL,CAAC;QACD,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;YACxB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,KAAK,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACzC,CAAC;IACL,CAAC;CAaJ,CAAA;AAzMY,wCAAc;AA8BJ;IADlB,IAAA,kBAAM,EAAC,2CAAmB,CAAC;sCACA,2CAAmB;+CAAC;AAG7B;IADlB,IAAA,kBAAM,EAAC,uCAAiB,CAAC;sCACA,uCAAiB;6CAAC;AAmBlC;IADT,IAAA,yBAAa,GAAE;;;;0CAiBf;yBApEQ,cAAc;IAD1B,IAAA,sBAAU,GAAE;GACA,cAAc,CAyM1B"}
+{"version":3,"file":"debug-view-model.js","sourceRoot":"","sources":["../../../src/browser/view/debug-view-model.ts"],"names":[],"mappings":"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"}

package/lib/browser/view/debug-watch-expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug-watch-expression.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-watch-expression.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,qBAAa,oBAAqB,SAAQ,cAAc;IAMxC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QACpC,EAAE,EAAE,MAAM,CAAC;QACX,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,oBAAoB,CAAC;QAC9B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,WAAW,EAAE,MAAM,IAAI,CAAA;KAC1B;IAVD,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC;gBAEH,OAAO,EAAE;QACpC,EAAE,EAAE,MAAM,CAAC;QACX,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,oBAAoB,CAAC;QAC9B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,WAAW,EAAE,MAAM,IAAI,CAAA;KAC1B;IAKc,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;cAIrB,SAAS,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAiBxF,MAAM,IAAI,KAAK,CAAC,SAAS;IAWlC,SAAS,CAAC,UAAU,IAAI,MAAM;IAUxB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAa3B,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IACD,SAAS,IAAI,IAAI;IAOjB,SAAS,CAAC,QAAQ,EAAE,eAAe,GAAG,SAAS,CAAC;IAChD,SAAS,CAAC,WAAW,aAAc,eAAe,GAAG,IAAI,iCAA2C;CAEvG"}
+{"version":3,"file":"debug-watch-expression.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-watch-expression.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,qBAAa,oBAAqB,SAAQ,cAAc;IAMxC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QACpC,EAAE,EAAE,MAAM,CAAC;QACX,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,oBAAoB,CAAC;QAC9B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,WAAW,EAAE,MAAM,IAAI,CAAA;KAC1B;IAVD,SAAkB,EAAE,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC;gBAEH,OAAO,EAAE;QACpC,EAAE,EAAE,MAAM,CAAC;QACX,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,oBAAoB,CAAC;QAC9B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,WAAW,EAAE,MAAM,IAAI,CAAA;KAC1B;IAIc,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;cAKrB,SAAS,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAgBxF,MAAM,IAAI,KAAK,CAAC,SAAS;IAWlC,SAAS,CAAC,UAAU,IAAI,MAAM;IAUxB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAa3B,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IACD,SAAS,IAAI,IAAI;IAOjB,SAAS,CAAC,QAAQ,EAAE,eAAe,GAAG,SAAS,CAAC;IAChD,SAAS,CAAC,WAAW,aAAc,eAAe,GAAG,IAAI,iCAA2C;CAEvG"}

package/lib/browser/view/debug-watch-expression.js

@@ -23,13 +23,13 @@ const browser_1 = require("@theia/core/lib/browser");
 const core_1 = require("@theia/core");
 class DebugWatchExpression extends debug_console_items_1.ExpressionItem {
     constructor(options) {
-        super(options.expression, options.session);
+        super(options.expression, options.session, options.id);
         this.options = options;
         this.setValueRef = (valueRef) => this.valueRef = valueRef || undefined;
-        this.id = options.id;
     }
     async evaluate() {
         await super.evaluate('watch');
+        this.options.onDidChange();
     }
     setResult(body, error) {
         const session = this.options.session();
@@ -45,7 +45,6 @@ class DebugWatchExpression extends debug_console_items_1.ExpressionItem {
             super.setResult(body, error);
             this.isError = !!error;
         }
-        this.options.onDidChange();
     }
     render() {
         const valueClass = this.valueClass();
@@ -53,7 +52,7 @@ class DebugWatchExpression extends debug_console_items_1.ExpressionItem {
             React.createElement("div", { className: browser_1.TREE_NODE_SEGMENT_GROW_CLASS },
                 React.createElement("span", { title: this.type || this._expression, className: 'name' },
                     this._expression,
-                    ": "),
+                    ":"),
                 React.createElement("span", { title: this._value, ref: this.setValueRef, className: valueClass }, this._value)),
             React.createElement("div", { className: (0, browser_1.codicon)('close', true), title: core_1.nls.localizeByDefault('Remove Expression'), onClick: this.options.remove }));
     }
@@ -64,7 +63,7 @@ class DebugWatchExpression extends debug_console_items_1.ExpressionItem {
         if (this.isNotAvailable) {
             return 'watch-not-available';
         }
-        return '';
+        return 'value';
     }
     async open() {
         const input = new dialogs_1.SingleTextInputDialog({

package/lib/browser/view/debug-watch-expression.js.map

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

package/lib/browser/view/debug-watch-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug-watch-source.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-watch-source.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAGhE,qBACa,gBAAiB,SAAQ,UAAU;IAG5C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAGzC,SAAS,CAAC,IAAI,IAAI,IAAI;IAKtB,SAAS,CAAC,QAAQ,CAAC,OAAO,sBAA6C;IAEjE,WAAW,IAAI,OAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;CAIvE"}
+{"version":3,"file":"debug-watch-source.d.ts","sourceRoot":"","sources":["../../../src/browser/view/debug-watch-source.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAGhE,qBACa,gBAAiB,SAAQ,UAAU;IAG5C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAGzC,SAAS,CAAC,IAAI,IAAI,IAAI;IAMtB,SAAS,CAAC,QAAQ,CAAC,OAAO,sBAA6C;IAEjE,WAAW,IAAI,OAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;CAIvE"}

package/lib/browser/view/debug-watch-source.js

@@ -29,6 +29,7 @@ let DebugWatchSource = class DebugWatchSource extends source_tree_1.TreeSource {
     init() {
         this.refresh();
         this.toDispose.push(this.model.onDidChangeWatchExpressions(() => this.refresh()));
+        this.toDispose.push(this.model.onDidResolveLazyVariable(() => this.refresh()));
     }
     async getElements() {
         return this.model.watchExpressions[Symbol.iterator]();

package/lib/browser/view/debug-watch-source.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug-watch-source.js","sourceRoot":"","sources":["../../../src/browser/view/debug-watch-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAiF;AACjF,qEAAiE;AACjE,yDAAoD;AAEpD,uCAAwC;AAGjC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,wBAAU;IAAzC;;QAWgB,YAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,GAAG,CAAC,CAAC;IAM3E,CAAC;IAXa,IAAI;QACV,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACtF,CAAC;IAID,KAAK,CAAC,WAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1D,CAAC;CAEJ,CAAA;AAjBY,4CAAgB;AAGN;IADlB,IAAA,kBAAM,EAAC,iCAAc,CAAC;sCACG,iCAAc;+CAAC;AAG/B;IADT,IAAA,yBAAa,GAAE;;;;4CAIf;2BATQ,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAiB5B"}
+{"version":3,"file":"debug-watch-source.js","sourceRoot":"","sources":["../../../src/browser/view/debug-watch-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAiF;AACjF,qEAAiE;AACjE,yDAAoD;AAEpD,uCAAwC;AAGjC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,wBAAU;IAAzC;;QAYgB,YAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,GAAG,CAAC,CAAC;IAM3E,CAAC;IAZa,IAAI;QACV,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAClF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnF,CAAC;IAID,KAAK,CAAC,WAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1D,CAAC;CAEJ,CAAA;AAlBY,4CAAgB;AAGN;IADlB,IAAA,kBAAM,EAAC,iCAAc,CAAC;sCACG,iCAAc;+CAAC;AAG/B;IADT,IAAA,yBAAa,GAAE;;;;4CAKf;2BAVQ,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAkB5B"}