@theia/debug 1.67.0-next.56 → 1.67.0-next.86

package/lib/node/stream-debug-adapter.d.ts

@@ -0,0 +1,41 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { Event } from '@theia/core/lib/common/event';
+import { ChildProcess } from 'child_process';
+import * as stream from 'stream';
+import * as net from 'net';
+import { DebugAdapter } from '../common/debug-model';
+declare abstract class StreamDebugAdapter extends DisposableCollection {
+    private fromAdapter;
+    private toAdapter;
+    private messageReceivedEmitter;
+    onMessageReceived: Event<string>;
+    private errorEmitter;
+    onError: Event<Error>;
+    private closeEmitter;
+    onClose: Event<void>;
+    private static TWO_CRLF;
+    private static CONTENT_LENGTH;
+    private contentLength;
+    private buffer;
+    constructor(fromAdapter: stream.Readable, toAdapter: stream.Writable);
+    handleClosed(): void;
+    send(message: string): void;
+    protected handleData(data: Buffer): void;
+}
+export declare class ProcessDebugAdapter extends StreamDebugAdapter implements DebugAdapter {
+    protected readonly process: ChildProcess;
+    constructor(process: ChildProcess);
+    stop(): Promise<void>;
+}
+export declare class SocketDebugAdapter extends StreamDebugAdapter implements DebugAdapter {
+    private readonly socket;
+    constructor(socket: net.Socket);
+    stop(): Promise<void>;
+}
+export {};
+//# sourceMappingURL=stream-debug-adapter.d.ts.map

package/lib/node/stream-debug-adapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-debug-adapter.d.ts","sourceRoot":"","sources":["../../src/node/stream-debug-adapter.ts"],"names":[],"mappings":";;;;;AAgBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAW,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,uBAAe,kBAAmB,SAAQ,oBAAoB;IAc9C,OAAO,CAAC,WAAW;IAAmB,OAAO,CAAC,SAAS;IAbnE,OAAO,CAAC,sBAAsB,CAAyB;IACvD,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAqC;IACrE,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAA2B;IAChD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAA2B;IAG/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IACrC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAoB;IACjD,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,MAAM,CAA2B;gBAErB,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAU,SAAS,EAAE,MAAM,CAAC,QAAQ;IASpF,YAAY,IAAI,IAAI;IAIpB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM3B,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CA0C3C;AAED,qBAAa,mBAAoB,SAAQ,kBAAmB,YAAW,YAAY;IAC/E,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;gBAC7B,OAAO,EAAE,YAAY;IAK3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAI9B;AAED,qBAAa,kBAAmB,SAAQ,kBAAmB,YAAW,YAAY;IAC9E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;gBACxB,MAAM,EAAE,GAAG,CAAC,MAAM;IAK9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAKxB"}

package/lib/node/stream-debug-adapter.js

@@ -0,0 +1,113 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2021 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SocketDebugAdapter = exports.ProcessDebugAdapter = void 0;
+const disposable_1 = require("@theia/core/lib/common/disposable");
+const event_1 = require("@theia/core/lib/common/event");
+class StreamDebugAdapter extends disposable_1.DisposableCollection {
+    constructor(fromAdapter, toAdapter) {
+        super();
+        this.fromAdapter = fromAdapter;
+        this.toAdapter = toAdapter;
+        this.messageReceivedEmitter = new event_1.Emitter();
+        this.onMessageReceived = this.messageReceivedEmitter.event;
+        this.errorEmitter = new event_1.Emitter();
+        this.onError = this.errorEmitter.event;
+        this.closeEmitter = new event_1.Emitter();
+        this.onClose = this.closeEmitter.event;
+        this.contentLength = -1;
+        this.buffer = Buffer.alloc(0);
+        this.fromAdapter.on('data', (data) => this.handleData(data));
+        this.fromAdapter.on('close', () => this.handleClosed()); // FIXME pass a proper exit code
+        this.fromAdapter.on('error', error => this.errorEmitter.fire(error));
+        this.toAdapter.on('error', error => this.errorEmitter.fire(error));
+    }
+    handleClosed() {
+        this.closeEmitter.fire();
+    }
+    send(message) {
+        const msg = `${StreamDebugAdapter.CONTENT_LENGTH}: ${Buffer.byteLength(message, 'utf8')}${StreamDebugAdapter.TWO_CRLF}${message}`;
+        this.toAdapter.write(msg, 'utf8');
+    }
+    handleData(data) {
+        this.buffer = Buffer.concat([this.buffer, data]);
+        while (true) {
+            if (this.contentLength >= 0) {
+                if (this.buffer.length >= this.contentLength) {
+                    const message = this.buffer.toString('utf8', 0, this.contentLength);
+                    this.buffer = this.buffer.slice(this.contentLength);
+                    this.contentLength = -1;
+                    if (message.length > 0) {
+                        this.messageReceivedEmitter.fire(message);
+                    }
+                    continue; // there may be more complete messages to process
+                }
+            }
+            else {
+                let idx = this.buffer.indexOf(StreamDebugAdapter.CONTENT_LENGTH);
+                if (idx > 0) {
+                    // log unrecognized output
+                    const output = this.buffer.slice(0, idx);
+                    console.log(output.toString('utf-8'));
+                    this.buffer = this.buffer.slice(idx);
+                }
+                idx = this.buffer.indexOf(StreamDebugAdapter.TWO_CRLF);
+                if (idx !== -1) {
+                    const header = this.buffer.toString('utf8', 0, idx);
+                    const lines = header.split('\r\n');
+                    for (let i = 0; i < lines.length; i++) {
+                        const pair = lines[i].split(/: +/);
+                        if (pair[0] === StreamDebugAdapter.CONTENT_LENGTH) {
+                            this.contentLength = +pair[1];
+                        }
+                    }
+                    this.buffer = this.buffer.slice(idx + StreamDebugAdapter.TWO_CRLF.length);
+                    continue;
+                }
+            }
+            break;
+        }
+    }
+}
+// these constants are for the message header, see: https://microsoft.github.io/debug-adapter-protocol/overview#header-part
+StreamDebugAdapter.TWO_CRLF = '\r\n\r\n';
+StreamDebugAdapter.CONTENT_LENGTH = 'Content-Length';
+class ProcessDebugAdapter extends StreamDebugAdapter {
+    constructor(process) {
+        super(process.stdout, process.stdin);
+        this.process = process;
+    }
+    async stop() {
+        var _a;
+        this.process.kill();
+        (_a = this.process.stdin) === null || _a === void 0 ? void 0 : _a.end();
+    }
+}
+exports.ProcessDebugAdapter = ProcessDebugAdapter;
+class SocketDebugAdapter extends StreamDebugAdapter {
+    constructor(socket) {
+        super(socket, socket);
+        this.socket = socket;
+    }
+    stop() {
+        return new Promise(resolve => {
+            this.socket.end(() => resolve());
+        });
+    }
+}
+exports.SocketDebugAdapter = SocketDebugAdapter;
+//# sourceMappingURL=stream-debug-adapter.js.map

package/lib/node/stream-debug-adapter.js.map

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

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@theia/debug",
-  "version": "1.67.0-next.56+d8f18cc386c",
+  "version": "1.67.0-next.86+03f92ff1d",
   "description": "Theia - Debug Extension",
   "dependencies": {
-    "@theia/console": "1.67.0-next.56+d8f18cc386c",
-    "@theia/core": "1.67.0-next.56+d8f18cc386c",
-    "@theia/editor": "1.67.0-next.56+d8f18cc386c",
-    "@theia/filesystem": "1.67.0-next.56+d8f18cc386c",
-    "@theia/markers": "1.67.0-next.56+d8f18cc386c",
-    "@theia/monaco": "1.67.0-next.56+d8f18cc386c",
+    "@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/monaco-editor-core": "1.96.302",
-    "@theia/output": "1.67.0-next.56+d8f18cc386c",
-    "@theia/process": "1.67.0-next.56+d8f18cc386c",
-    "@theia/task": "1.67.0-next.56+d8f18cc386c",
-    "@theia/terminal": "1.67.0-next.56+d8f18cc386c",
-    "@theia/test": "1.67.0-next.56+d8f18cc386c",
-    "@theia/variable-resolver": "1.67.0-next.56+d8f18cc386c",
-    "@theia/workspace": "1.67.0-next.56+d8f18cc386c",
+    "@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",
     "@vscode/debugprotocol": "^1.51.0",
     "fast-deep-equal": "^3.1.3",
     "jsonc-parser": "^2.2.0",
@@ -64,5 +64,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "d8f18cc386c45a736cd193d42eab02c8f64c6b10"
+  "gitHead": "03f92ff1d97dcb199de39b48e60a53535de22808"
 }

package/src/browser/console/debug-console-items.tsx

@@ -16,12 +16,12 @@
 
 import * as React from '@theia/core/shared/react';
 import { DebugProtocol } from '@vscode/debugprotocol/lib/debugProtocol';
-import { SingleTextInputDialog } from '@theia/core/lib/browser';
+import { codicon, SingleTextInputDialog } from '@theia/core/lib/browser';
 import { ConsoleItem, CompositeConsoleItem } from '@theia/console/lib/browser/console-session';
 import { DebugSession, formatMessage } from '../debug-session';
 import { Severity } from '@theia/core/lib/common/severity';
 import * as monaco from '@theia/monaco-editor-core';
-import { nls } from '@theia/core';
+import { generateUuid, nls } from '@theia/core';
 
 export type DebugSessionProvider = () => DebugSession | undefined;
 
@@ -34,17 +34,24 @@ export class ExpressionContainer implements CompositeConsoleItem {
         return this.sessionProvider();
     }
 
+    readonly id: string | number;
     protected variablesReference: number;
     protected namedVariables: number | undefined;
     protected indexedVariables: number | undefined;
+    protected presentationHint: DebugProtocol.VariablePresentationHint | undefined;
     protected readonly startOfVariables: number;
 
     constructor(options: ExpressionContainer.Options) {
         this.sessionProvider = options.session;
+        this.id = options.id ?? generateUuid();
         this.variablesReference = options.variablesReference || 0;
         this.namedVariables = options.namedVariables;
         this.indexedVariables = options.indexedVariables;
         this.startOfVariables = options.startOfVariables || 0;
+        this.presentationHint = options.presentationHint;
+        if (this.lazy) {
+            (this as CompositeConsoleItem).expandByDefault = () => !this.lazy && !this.session?.autoExpandLazyVariables;
+        }
     }
 
     render(): React.ReactNode {
@@ -56,7 +63,31 @@ export class ExpressionContainer implements CompositeConsoleItem {
     }
 
     get hasElements(): boolean {
-        return this.variablesReference !== undefined;
+        return !!this.variablesReference && !this.lazy;
+    }
+
+    get lazy(): boolean {
+        return !!this.presentationHint?.lazy;
+    }
+
+    async resolveLazy(): Promise<void> {
+        const { session, variablesReference, lazy } = this;
+        if (!session || !variablesReference || !lazy) {
+            return;
+        }
+        const response = await session.sendRequest('variables', { variablesReference });
+        const { variables } = response.body;
+        if (variables.length !== 1) {
+            return;
+        }
+        this.handleResolvedLazy(variables[0]);
+    }
+
+    protected handleResolvedLazy(resolved: DebugProtocol.Variable): void {
+        this.variablesReference = resolved.variablesReference;
+        this.namedVariables = resolved.namedVariables;
+        this.indexedVariables = resolved.indexedVariables;
+        this.presentationHint = resolved.presentationHint;
     }
 
     protected elements: Promise<ExpressionContainer[]> | undefined;
@@ -85,13 +116,15 @@ export class ExpressionContainer implements CompositeConsoleItem {
                     const start = this.startOfVariables + i * chunkSize;
                     const count = Math.min(chunkSize, this.indexedVariables - i * chunkSize);
                     const { variablesReference } = this;
+                    const name = `[${start}..${start + count - 1}]`;
                     result.push(new DebugVirtualVariable({
                         session: this.sessionProvider,
+                        id: `${this.id}:${name}`,
                         variablesReference,
                         namedVariables: 0,
                         indexedVariables: count,
                         startOfVariables: start,
-                        name: `[${start}..${start + count - 1}]`
+                        name
                     }));
                 }
                 return result;
@@ -105,14 +138,23 @@ export class ExpressionContainer implements CompositeConsoleItem {
     protected fetch(result: ConsoleItem[], filter: 'indexed', start: number, count?: number): Promise<void>;
     protected async fetch(result: ConsoleItem[], filter: 'indexed' | 'named', start?: number, count?: number): Promise<void> {
         try {
-            const { variablesReference } = this;
-            const response = await this.session!.sendRequest('variables', { variablesReference, filter, start, count });
-            const { variables } = response.body;
-            const names = new Set<string>();
-            for (const variable of variables) {
-                if (!names.has(variable.name)) {
-                    result.push(new DebugVariable(this.sessionProvider, variable, this));
-                    names.add(variable.name);
+            const { session } = this;
+            if (session) {
+                const { variablesReference } = this;
+                const response = await session.sendRequest('variables', { variablesReference, filter, start, count });
+                const { variables } = response.body;
+                const names = new Set<string>();
+                const debugVariables: DebugVariable[] = [];
+                for (const variable of variables) {
+                    if (!names.has(variable.name)) {
+                        const v = new DebugVariable(this.sessionProvider, variable, this);
+                        debugVariables.push(v);
+                        result.push(v);
+                        names.add(variable.name);
+                    }
+                }
+                if (session.autoExpandLazyVariables) {
+                    await Promise.all(debugVariables.map(v => v.lazy && v.resolveLazy()));
                 }
             }
         } catch (e) {
@@ -128,10 +170,12 @@ export class ExpressionContainer implements CompositeConsoleItem {
 export namespace ExpressionContainer {
     export interface Options {
         session: DebugSessionProvider,
+        id?: string | number,
         variablesReference?: number
         namedVariables?: number
         indexedVariables?: number
         startOfVariables?: number
+        presentationHint?: DebugProtocol.VariablePresentationHint
     }
 }
 
@@ -147,9 +191,11 @@ export class DebugVariable extends ExpressionContainer {
     ) {
         super({
             session,
+            id: `${parent.id}:${variable.name}`,
             variablesReference: variable.variablesReference,
             namedVariables: variable.namedVariables,
-            indexedVariables: variable.indexedVariables
+            indexedVariables: variable.indexedVariables,
+            presentationHint: variable.presentationHint
         });
     }
 
@@ -169,17 +215,20 @@ export class DebugVariable extends ExpressionContainer {
     }
 
     get readOnly(): boolean {
-        return this.variable.presentationHint?.attributes?.includes('readOnly') ?? false;
+        return this.presentationHint?.attributes?.includes('readOnly') || this.lazy;
     }
 
     override render(): React.ReactNode {
-        const { type, value, name } = this;
+        const { type, value, name, lazy } = this;
         return <div className={this.variableClassName}>
-            <span title={type || name} className='name' ref={this.setNameRef}>{name}{!!value && ': '}</span>
-            <span title={value} ref={this.setValueRef}>{value}</span>
+            <span title={type || name} className='name' ref={this.setNameRef}>{name}{(value || lazy) && ': '}</span>
+            {lazy && <span title={nls.localizeByDefault('Click to expand')} className={codicon('eye') + ' lazy-button'} onClick={this.handleLazyButtonClick} />}
+            <span title={value} className='value' ref={this.setValueRef}>{value}</span>
         </div>;
     }
 
+    private readonly handleLazyButtonClick = () => this.resolveLazy();
+
     protected get variableClassName(): string {
         const { type, value } = this;
         const classNames = ['theia-debug-console-variable'];
@@ -195,6 +244,13 @@ export class DebugVariable extends ExpressionContainer {
         return classNames.join(' ');
     }
 
+    protected override handleResolvedLazy(resolved: DebugProtocol.Variable): void {
+        this._value = resolved.value;
+        this._type = resolved.type || this._type;
+        super.handleResolvedLazy(resolved);
+        this.session?.['onDidResolveLazyVariableEmitter'].fire(this);
+    }
+
     get supportSetVariable(): boolean {
         return !!this.session && !!this.session.capabilities.supportsSetVariable;
     }
@@ -312,9 +368,10 @@ export class ExpressionItem extends ExpressionContainer {
 
     constructor(
         protected _expression: string,
-        session: DebugSessionProvider
+        session: DebugSessionProvider,
+        id?: string | number
     ) {
-        super({ session });
+        super({ session, id });
     }
 
     get expression(): string {
@@ -333,7 +390,7 @@ export class ExpressionItem extends ExpressionContainer {
         </div>;
     }
 
-    async evaluate(context: string = 'repl'): Promise<void> {
+    async evaluate(context: string = 'repl', resolveLazy = true): Promise<void> {
         const session = this.session;
         if (!session?.currentFrame) {
             this.setResult(undefined, ExpressionItem.notAvailable);
@@ -343,6 +400,9 @@ export class ExpressionItem extends ExpressionContainer {
         try {
             const body = await session.evaluate(this._expression, context);
             this.setResult(body);
+            if (this.lazy && resolveLazy) {
+                await this.resolveLazy();
+            }
         } catch (err) {
             this.setResult(undefined, err.message);
         }
@@ -356,6 +416,7 @@ export class ExpressionItem extends ExpressionContainer {
             this.variablesReference = body.variablesReference;
             this.namedVariables = body.namedVariables;
             this.indexedVariables = body.indexedVariables;
+            this.presentationHint = body.presentationHint;
             this.severity = Severity.Log;
         } else {
             this._value = error;
@@ -364,21 +425,29 @@ export class ExpressionItem extends ExpressionContainer {
             this.variablesReference = 0;
             this.namedVariables = undefined;
             this.indexedVariables = undefined;
+            this.presentationHint = undefined;
             this.severity = Severity.Error;
         }
         this.elements = undefined;
     }
 
+    protected override handleResolvedLazy(resolved: DebugProtocol.Variable): void {
+        this._value = resolved.value;
+        this._type = resolved.type || this._type;
+        super.handleResolvedLazy(resolved);
+    }
 }
 
 export class DebugScope extends ExpressionContainer {
 
     constructor(
         protected readonly raw: DebugProtocol.Scope,
-        session: DebugSessionProvider
+        session: DebugSessionProvider,
+        id: number
     ) {
         super({
             session,
+            id: `${raw.name}:${id}`,
             variablesReference: raw.variablesReference,
             namedVariables: raw.namedVariables,
             indexedVariables: raw.indexedVariables

package/src/browser/console/debug-console-session.ts

@@ -85,6 +85,7 @@ export class DebugConsoleSession extends ConsoleSession {
             triggerCharacters: ['.'],
             provideCompletionItems: (model, position) => this.completions(model, position),
         }));
+        this.toDispose.push(this.sessionManager.onDidResolveLazyVariable(() => this.fireDidChange()));
     }
 
     getElements(): IterableIterator<ConsoleItem> {

package/src/browser/debug-session-contribution.ts

@@ -146,7 +146,9 @@ export class DefaultDebugSessionFactory implements DebugSessionFactory {
             this.messages,
             this.fileService,
             this.debugContributionProvider,
-            this.workspaceService);
+            this.workspaceService,
+            this.debugPreferences
+        );
     }
 
     protected getTraceOutputChannel(): OutputChannel | undefined {

package/src/browser/debug-session-manager.ts

@@ -39,6 +39,7 @@ import * as monaco from '@theia/monaco-editor-core';
 import { DebugInstructionBreakpoint } from './model/debug-instruction-breakpoint';
 import { DebugSessionConfigurationLabelProvider } from './debug-session-configuration-label-provider';
 import { DebugDataBreakpoint } from './model/debug-data-breakpoint';
+import { DebugVariable } from './console/debug-console-items';
 
 export interface WillStartDebugSession extends WaitUntilEvent {
 }
@@ -57,6 +58,11 @@ export interface DidChangeBreakpointsEvent {
     uri: URI
 }
 
+export interface DidResolveLazyVariableEvent {
+    readonly session: DebugSession
+    readonly variable: DebugVariable
+}
+
 export interface DebugSessionCustomEvent {
     readonly body?: any // eslint-disable-line @typescript-eslint/no-explicit-any
     readonly event: string
@@ -112,6 +118,9 @@ export class DebugSessionManager {
         this.onDidChangeEmitter.fire(current);
     }
 
+    protected readonly onDidResolveLazyVariableEmitter = new Emitter<DidResolveLazyVariableEvent>();
+    readonly onDidResolveLazyVariable: Event<DidResolveLazyVariableEvent> = this.onDidResolveLazyVariableEmitter.event;
+
     @inject(DebugSessionFactory)
     protected readonly debugSessionFactory: DebugSessionFactory;
 
@@ -544,6 +553,7 @@ export class DebugSessionManager {
                 }
                 this.fireDidChange(current);
             }));
+            this.disposeOnCurrentSessionChanged.push(current.onDidResolveLazyVariable(variable => this.onDidResolveLazyVariableEmitter.fire({ session: current, variable })));
             this.disposeOnCurrentSessionChanged.push(current.onDidFocusStackFrame(frame => this.onDidFocusStackFrameEmitter.fire(frame)));
             this.disposeOnCurrentSessionChanged.push(current.onDidFocusThread(thread => this.onDidFocusThreadEmitter.fire(thread)));
             const { currentThread } = current;

package/src/browser/debug-session.tsx

@@ -25,7 +25,7 @@ import { EditorManager } from '@theia/editor/lib/browser';
 import { CompositeTreeElement } from '@theia/core/lib/browser/source-tree';
 import { DebugSessionConnection, DebugRequestTypes, DebugEventTypes } from './debug-session-connection';
 import { DebugThread, StoppedDetails, DebugThreadData } from './model/debug-thread';
-import { DebugScope } from './console/debug-console-items';
+import { DebugScope, DebugVariable } from './console/debug-console-items';
 import { DebugStackFrame } from './model/debug-stack-frame';
 import { DebugSource } from './model/debug-source';
 import { DebugBreakpoint, DebugBreakpointOptions } from './model/debug-breakpoint';
@@ -47,6 +47,7 @@ import { nls } from '@theia/core';
 import { TestService, TestServices } from '@theia/test/lib/browser/test-service';
 import { DebugSessionManager } from './debug-session-manager';
 import { DebugDataBreakpoint } from './model/debug-data-breakpoint';
+import { DebugPreferences } from '../common/debug-preferences';
 
 export enum DebugState {
     Inactive,
@@ -103,6 +104,9 @@ export class DebugSession implements CompositeTreeElement {
         this.onDidChangeBreakpointsEmitter.fire(uri);
     }
 
+    protected readonly onDidResolveLazyVariableEmitter = new Emitter<DebugVariable>();
+    readonly onDidResolveLazyVariable: Event<DebugVariable> = this.onDidResolveLazyVariableEmitter.event;
+
     protected readonly childSessions = new Map<string, DebugSession>();
     protected readonly toDispose = new DisposableCollection();
 
@@ -124,6 +128,7 @@ export class DebugSession implements CompositeTreeElement {
         protected readonly fileService: FileService,
         protected readonly debugContributionProvider: ContributionProvider<DebugContribution>,
         protected readonly workspaceService: WorkspaceService,
+        protected readonly debugPreferences: DebugPreferences,
         /**
          * Number of millis after a `stop` request times out. It's 5 seconds by default.
          */
@@ -157,7 +162,10 @@ export class DebugSession implements CompositeTreeElement {
         this.connection.onDidClose(() => this.toDispose.dispose());
         this.toDispose.pushAll([
             this.onDidChangeEmitter,
+            this.onDidFocusStackFrameEmitter,
+            this.onDidFocusThreadEmitter,
             this.onDidChangeBreakpointsEmitter,
+            this.onDidResolveLazyVariableEmitter,
             Disposable.create(() => {
                 this.clearBreakpoints();
                 this.doUpdateThreads([]);
@@ -186,6 +194,10 @@ export class DebugSession implements CompositeTreeElement {
         return this._capabilities;
     }
 
+    get autoExpandLazyVariables(): boolean {
+        return this.debugPreferences['debug.autoExpandLazyVariables'] === 'on';
+    }
+
     protected readonly sources = new Map<string, DebugSource>();
     getSource(raw: DebugProtocol.Source): DebugSource {
         const uri = DebugSource.toUri(raw).toString();

package/src/browser/editor/debug-hover-source.tsx

@@ -18,7 +18,7 @@ import * as React from '@theia/core/shared/react';
 import { TreeSource, TreeElement } from '@theia/core/lib/browser/source-tree';
 import { ExpressionContainer, ExpressionItem, DebugVariable } from '../console/debug-console-items';
 import { DebugSessionManager } from '../debug-session-manager';
-import { injectable, inject } from '@theia/core/shared/inversify';
+import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 
 @injectable()
 export class DebugHoverSource extends TreeSource {
@@ -36,6 +36,11 @@ export class DebugHoverSource extends TreeSource {
         return this.elements[Symbol.iterator]();
     }
 
+    @postConstruct()
+    init(): void {
+        this.toDispose.push(this.sessions.onDidResolveLazyVariable(() => this.fireDidChange()));
+    }
+
     protected renderTitle(element: ExpressionItem | DebugVariable): React.ReactNode {
         return <div className='theia-debug-hover-title' title={element.value}>{element.value}</div>;
     }
@@ -101,5 +106,4 @@ export class DebugHoverSource extends TreeSource {
             return this.doFindVariable(variables[0], namesToFind.slice(1));
         }
     }
-
 }

package/src/browser/editor/debug-inline-value-decorator.ts

@@ -194,7 +194,7 @@ export class DebugInlineValueDecorator implements FrontendApplicationContributio
                                     }
                                     if (expr) {
                                         const expression = new ExpressionItem(expr, () => stackFrame.thread.session);
-                                        await expression.evaluate('watch');
+                                        await expression.evaluate('watch', false);
                                         if (expression.available) {
                                             text = this.formatInlineValue(expr, expression.value);
                                         }