@theia/debug 1.34.2 → 1.34.3

package/src/browser/editor/debug-exception-widget.tsx

@@ -1,118 +1,118 @@
-// *****************************************************************************
-// Copyright (C) 2019 TypeFox 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as React from '@theia/core/shared/react';
-import { createRoot, Root } from '@theia/core/shared/react-dom/client';
-import * as monaco from '@theia/monaco-editor-core';
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
-import { MonacoEditorZoneWidget } from '@theia/monaco/lib/browser/monaco-editor-zone-widget';
-import { DebugEditor } from './debug-editor';
-import { DebugExceptionInfo } from '../model/debug-thread';
-import { nls } from '@theia/core/lib/common/nls';
-import { codicon } from '@theia/core/lib/browser/widgets';
-
-export interface ShowDebugExceptionParams {
-    info: DebugExceptionInfo
-    lineNumber: number
-    column: number
-}
-
-export class DebugExceptionMonacoEditorZoneWidget extends MonacoEditorZoneWidget {
-
-    protected override computeContainerHeight(zoneHeight: number): {
-        height: number,
-        frameWidth: number
-    } {
-        // reset height to match it to the content
-        this.containerNode.style.height = 'initial';
-        const height = this.containerNode.offsetHeight;
-        const result = super.computeContainerHeight(zoneHeight);
-        result.height = height;
-        return result;
-    }
-
-}
-
-@injectable()
-export class DebugExceptionWidget implements Disposable {
-
-    @inject(DebugEditor)
-    readonly editor: DebugEditor;
-
-    protected zone: MonacoEditorZoneWidget;
-    protected containerNodeRoot: Root;
-
-    protected readonly toDispose = new DisposableCollection();
-
-    @postConstruct()
-    protected async init(): Promise<void> {
-        this.toDispose.push(this.zone = new DebugExceptionMonacoEditorZoneWidget(this.editor.getControl()));
-        this.zone.containerNode.classList.add('theia-debug-exception-widget');
-        this.containerNodeRoot = createRoot(this.zone.containerNode);
-        this.toDispose.push(Disposable.create(() => this.containerNodeRoot.unmount()));
-        this.toDispose.push(this.editor.getControl().onDidLayoutChange(() => this.layout()));
-    }
-
-    dispose(): void {
-        this.toDispose.dispose();
-    }
-
-    show({ info, lineNumber, column }: ShowDebugExceptionParams): void {
-        this.render(info, () => {
-            const fontInfo = this.editor.getControl().getOption(monaco.editor.EditorOption.fontInfo);
-            this.zone.containerNode.style.fontSize = `${fontInfo.fontSize}px`;
-            this.zone.containerNode.style.lineHeight = `${fontInfo.lineHeight}px`;
-
-            if (lineNumber !== undefined && column !== undefined) {
-                const afterLineNumber = lineNumber;
-                const afterColumn = column;
-                this.zone.show({ showFrame: true, afterLineNumber, afterColumn, heightInLines: 0, frameWidth: 1 });
-            }
-
-            this.layout();
-        });
-    }
-
-    hide(): void {
-        this.zone.hide();
-    }
-
-    protected render(info: DebugExceptionInfo, cb: () => void): void {
-        const stackTrace = info.details && info.details.stackTrace;
-        const exceptionTitle = info.id ?
-            nls.localizeByDefault('Exception has occurred: {0}', info.id) :
-            nls.localizeByDefault('Exception has occurred.');
-        this.containerNodeRoot.render(<React.Fragment>
-            <div className='title' ref={cb}>
-                {exceptionTitle}
-                <span id="exception-close" className={codicon('close', true)} onClick={() => this.hide()} title={nls.localizeByDefault('Close')}></span>
-            </div>
-            {info.description && <div className='description'>{info.description}</div>}
-            {stackTrace && <div className='stack-trace'>{stackTrace}</div>}
-        </React.Fragment>);
-    }
-
-    protected layout(): void {
-        // reset height to match it to the content
-        this.zone.containerNode.style.height = 'initial';
-
-        const lineHeight = this.editor.getControl().getOption(monaco.editor.EditorOption.lineHeight);
-        const heightInLines = Math.ceil(this.zone.containerNode.offsetHeight / lineHeight);
-        this.zone.layout(heightInLines);
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2019 TypeFox 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as React from '@theia/core/shared/react';
+import { createRoot, Root } from '@theia/core/shared/react-dom/client';
+import * as monaco from '@theia/monaco-editor-core';
+import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
+import { MonacoEditorZoneWidget } from '@theia/monaco/lib/browser/monaco-editor-zone-widget';
+import { DebugEditor } from './debug-editor';
+import { DebugExceptionInfo } from '../model/debug-thread';
+import { nls } from '@theia/core/lib/common/nls';
+import { codicon } from '@theia/core/lib/browser/widgets';
+
+export interface ShowDebugExceptionParams {
+    info: DebugExceptionInfo
+    lineNumber: number
+    column: number
+}
+
+export class DebugExceptionMonacoEditorZoneWidget extends MonacoEditorZoneWidget {
+
+    protected override computeContainerHeight(zoneHeight: number): {
+        height: number,
+        frameWidth: number
+    } {
+        // reset height to match it to the content
+        this.containerNode.style.height = 'initial';
+        const height = this.containerNode.offsetHeight;
+        const result = super.computeContainerHeight(zoneHeight);
+        result.height = height;
+        return result;
+    }
+
+}
+
+@injectable()
+export class DebugExceptionWidget implements Disposable {
+
+    @inject(DebugEditor)
+    readonly editor: DebugEditor;
+
+    protected zone: MonacoEditorZoneWidget;
+    protected containerNodeRoot: Root;
+
+    protected readonly toDispose = new DisposableCollection();
+
+    @postConstruct()
+    protected async init(): Promise<void> {
+        this.toDispose.push(this.zone = new DebugExceptionMonacoEditorZoneWidget(this.editor.getControl()));
+        this.zone.containerNode.classList.add('theia-debug-exception-widget');
+        this.containerNodeRoot = createRoot(this.zone.containerNode);
+        this.toDispose.push(Disposable.create(() => this.containerNodeRoot.unmount()));
+        this.toDispose.push(this.editor.getControl().onDidLayoutChange(() => this.layout()));
+    }
+
+    dispose(): void {
+        this.toDispose.dispose();
+    }
+
+    show({ info, lineNumber, column }: ShowDebugExceptionParams): void {
+        this.render(info, () => {
+            const fontInfo = this.editor.getControl().getOption(monaco.editor.EditorOption.fontInfo);
+            this.zone.containerNode.style.fontSize = `${fontInfo.fontSize}px`;
+            this.zone.containerNode.style.lineHeight = `${fontInfo.lineHeight}px`;
+
+            if (lineNumber !== undefined && column !== undefined) {
+                const afterLineNumber = lineNumber;
+                const afterColumn = column;
+                this.zone.show({ showFrame: true, afterLineNumber, afterColumn, heightInLines: 0, frameWidth: 1 });
+            }
+
+            this.layout();
+        });
+    }
+
+    hide(): void {
+        this.zone.hide();
+    }
+
+    protected render(info: DebugExceptionInfo, cb: () => void): void {
+        const stackTrace = info.details && info.details.stackTrace;
+        const exceptionTitle = info.id ?
+            nls.localizeByDefault('Exception has occurred: {0}', info.id) :
+            nls.localizeByDefault('Exception has occurred.');
+        this.containerNodeRoot.render(<React.Fragment>
+            <div className='title' ref={cb}>
+                {exceptionTitle}
+                <span id="exception-close" className={codicon('close', true)} onClick={() => this.hide()} title={nls.localizeByDefault('Close')}></span>
+            </div>
+            {info.description && <div className='description'>{info.description}</div>}
+            {stackTrace && <div className='stack-trace'>{stackTrace}</div>}
+        </React.Fragment>);
+    }
+
+    protected layout(): void {
+        // reset height to match it to the content
+        this.zone.containerNode.style.height = 'initial';
+
+        const lineHeight = this.editor.getControl().getOption(monaco.editor.EditorOption.lineHeight);
+        const heightInLines = Math.ceil(this.zone.containerNode.offsetHeight / lineHeight);
+        this.zone.layout(heightInLines);
+    }
+
+}

package/src/browser/editor/debug-expression-provider.ts

@@ -1,78 +1,78 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation and others. All rights reserved.
- *  Licensed under the MIT License. See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { injectable } from '@theia/core/shared/inversify';
-import * as monaco from '@theia/monaco-editor-core';
-
-/**
- * TODO: introduce a new request to LSP to look up an expression range: https://github.com/Microsoft/language-server-protocol/issues/462
- */
-@injectable()
-export class DebugExpressionProvider {
-    get(model: monaco.editor.IModel, selection: monaco.IRange): string {
-        const lineContent = model.getLineContent(selection.startLineNumber);
-        const { start, end } = this.getExactExpressionStartAndEnd(lineContent, selection.startColumn, selection.endColumn);
-        return lineContent.substring(start - 1, end);
-    }
-    protected getExactExpressionStartAndEnd(lineContent: string, looseStart: number, looseEnd: number): { start: number, end: number } {
-        let matchingExpression: string | undefined = undefined;
-        let startOffset = 0;
-
-        // Some example supported expressions: myVar.prop, a.b.c.d, myVar?.prop, myVar->prop, MyClass::StaticProp, *myVar
-        // Match any character except a set of characters which often break interesting sub-expressions
-        const expression = /([^()\[\]{}<>\s+\-/%~#^;=|,`!]|\->)+/g;
-        // eslint-disable-next-line no-null/no-null
-        let result: RegExpExecArray | null = null;
-
-        // First find the full expression under the cursor
-        while (result = expression.exec(lineContent)) {
-            const start = result.index + 1;
-            const end = start + result[0].length;
-
-            if (start <= looseStart && end >= looseEnd) {
-                matchingExpression = result[0];
-                startOffset = start;
-                break;
-            }
-        }
-
-        // If there are non-word characters after the cursor, we want to truncate the expression then.
-        // For example in expression 'a.b.c.d', if the focus was under 'b', 'a.b' would be evaluated.
-        if (matchingExpression) {
-            const subExpression: RegExp = /\w+/g;
-            // eslint-disable-next-line no-null/no-null
-            let subExpressionResult: RegExpExecArray | null = null;
-            while (subExpressionResult = subExpression.exec(matchingExpression)) {
-                const subEnd = subExpressionResult.index + 1 + startOffset + subExpressionResult[0].length;
-                if (subEnd >= looseEnd) {
-                    break;
-                }
-            }
-
-            if (subExpressionResult) {
-                matchingExpression = matchingExpression.substring(0, subExpression.lastIndex);
-            }
-        }
-
-        return matchingExpression ?
-            { start: startOffset, end: startOffset + matchingExpression.length - 1 } :
-            { start: 0, end: 0 };
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation and others. All rights reserved.
+ *  Licensed under the MIT License. See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { injectable } from '@theia/core/shared/inversify';
+import * as monaco from '@theia/monaco-editor-core';
+
+/**
+ * TODO: introduce a new request to LSP to look up an expression range: https://github.com/Microsoft/language-server-protocol/issues/462
+ */
+@injectable()
+export class DebugExpressionProvider {
+    get(model: monaco.editor.IModel, selection: monaco.IRange): string {
+        const lineContent = model.getLineContent(selection.startLineNumber);
+        const { start, end } = this.getExactExpressionStartAndEnd(lineContent, selection.startColumn, selection.endColumn);
+        return lineContent.substring(start - 1, end);
+    }
+    protected getExactExpressionStartAndEnd(lineContent: string, looseStart: number, looseEnd: number): { start: number, end: number } {
+        let matchingExpression: string | undefined = undefined;
+        let startOffset = 0;
+
+        // Some example supported expressions: myVar.prop, a.b.c.d, myVar?.prop, myVar->prop, MyClass::StaticProp, *myVar
+        // Match any character except a set of characters which often break interesting sub-expressions
+        const expression = /([^()\[\]{}<>\s+\-/%~#^;=|,`!]|\->)+/g;
+        // eslint-disable-next-line no-null/no-null
+        let result: RegExpExecArray | null = null;
+
+        // First find the full expression under the cursor
+        while (result = expression.exec(lineContent)) {
+            const start = result.index + 1;
+            const end = start + result[0].length;
+
+            if (start <= looseStart && end >= looseEnd) {
+                matchingExpression = result[0];
+                startOffset = start;
+                break;
+            }
+        }
+
+        // If there are non-word characters after the cursor, we want to truncate the expression then.
+        // For example in expression 'a.b.c.d', if the focus was under 'b', 'a.b' would be evaluated.
+        if (matchingExpression) {
+            const subExpression: RegExp = /\w+/g;
+            // eslint-disable-next-line no-null/no-null
+            let subExpressionResult: RegExpExecArray | null = null;
+            while (subExpressionResult = subExpression.exec(matchingExpression)) {
+                const subEnd = subExpressionResult.index + 1 + startOffset + subExpressionResult[0].length;
+                if (subEnd >= looseEnd) {
+                    break;
+                }
+            }
+
+            if (subExpressionResult) {
+                matchingExpression = matchingExpression.substring(0, subExpression.lastIndex);
+            }
+        }
+
+        return matchingExpression ?
+            { start: startOffset, end: startOffset + matchingExpression.length - 1 } :
+            { start: 0, end: 0 };
+    }
+}

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

@@ -1,105 +1,105 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-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';
-
-@injectable()
-export class DebugHoverSource extends TreeSource {
-
-    @inject(DebugSessionManager)
-    protected readonly sessions: DebugSessionManager;
-
-    protected _expression: ExpressionItem | DebugVariable | undefined;
-    get expression(): ExpressionItem | DebugVariable | undefined {
-        return this._expression;
-    }
-
-    protected elements: TreeElement[] = [];
-    getElements(): IterableIterator<TreeElement> {
-        return this.elements[Symbol.iterator]();
-    }
-
-    protected renderTitle(element: ExpressionItem | DebugVariable): React.ReactNode {
-        return <div className='theia-debug-hover-title' title={element.value}>{element.value}</div>;
-    }
-
-    reset(): void {
-        this._expression = undefined;
-        this.elements = [];
-        this.fireDidChange();
-    }
-
-    async evaluate(expression: string): Promise<ExpressionItem | DebugVariable | undefined> {
-        const evaluated = await this.doEvaluate(expression);
-        const elements = evaluated && await evaluated.getElements();
-        this._expression = evaluated;
-        this.elements = elements ? [...elements] : [];
-        this.fireDidChange();
-        return evaluated;
-    }
-    protected async doEvaluate(expression: string): Promise<ExpressionItem | DebugVariable | undefined> {
-        const { currentSession } = this.sessions;
-        if (!currentSession) {
-            return undefined;
-        }
-        if (currentSession.capabilities.supportsEvaluateForHovers) {
-            const item = new ExpressionItem(expression, () => currentSession);
-            await item.evaluate('hover');
-            return item.available && item || undefined;
-        }
-        return this.findVariable(expression.split('.').map(word => word.trim()).filter(word => !!word));
-    }
-    protected async findVariable(namesToFind: string[]): Promise<DebugVariable | undefined> {
-        const { currentFrame } = this.sessions;
-        if (!currentFrame) {
-            return undefined;
-        }
-        let variable: DebugVariable | undefined;
-        const scopes = await currentFrame.getScopes();
-        for (const scope of scopes) {
-            const found = await this.doFindVariable(scope, namesToFind);
-            if (!variable) {
-                variable = found;
-            } else if (found && found.value !== variable.value) {
-                // only show if all expressions found have the same value
-                return undefined;
-            }
-        }
-        return variable;
-    }
-    protected async doFindVariable(owner: ExpressionContainer, namesToFind: string[]): Promise<DebugVariable | undefined> {
-        const elements = await owner.getElements();
-        const variables: DebugVariable[] = [];
-        for (const element of elements) {
-            if (element instanceof DebugVariable && element.name === namesToFind[0]) {
-                variables.push(element);
-            }
-        }
-        if (variables.length !== 1) {
-            return undefined;
-        }
-        if (namesToFind.length === 1) {
-            return variables[0];
-        } else {
-            return this.doFindVariable(variables[0], namesToFind.slice(1));
-        }
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+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';
+
+@injectable()
+export class DebugHoverSource extends TreeSource {
+
+    @inject(DebugSessionManager)
+    protected readonly sessions: DebugSessionManager;
+
+    protected _expression: ExpressionItem | DebugVariable | undefined;
+    get expression(): ExpressionItem | DebugVariable | undefined {
+        return this._expression;
+    }
+
+    protected elements: TreeElement[] = [];
+    getElements(): IterableIterator<TreeElement> {
+        return this.elements[Symbol.iterator]();
+    }
+
+    protected renderTitle(element: ExpressionItem | DebugVariable): React.ReactNode {
+        return <div className='theia-debug-hover-title' title={element.value}>{element.value}</div>;
+    }
+
+    reset(): void {
+        this._expression = undefined;
+        this.elements = [];
+        this.fireDidChange();
+    }
+
+    async evaluate(expression: string): Promise<ExpressionItem | DebugVariable | undefined> {
+        const evaluated = await this.doEvaluate(expression);
+        const elements = evaluated && await evaluated.getElements();
+        this._expression = evaluated;
+        this.elements = elements ? [...elements] : [];
+        this.fireDidChange();
+        return evaluated;
+    }
+    protected async doEvaluate(expression: string): Promise<ExpressionItem | DebugVariable | undefined> {
+        const { currentSession } = this.sessions;
+        if (!currentSession) {
+            return undefined;
+        }
+        if (currentSession.capabilities.supportsEvaluateForHovers) {
+            const item = new ExpressionItem(expression, () => currentSession);
+            await item.evaluate('hover');
+            return item.available && item || undefined;
+        }
+        return this.findVariable(expression.split('.').map(word => word.trim()).filter(word => !!word));
+    }
+    protected async findVariable(namesToFind: string[]): Promise<DebugVariable | undefined> {
+        const { currentFrame } = this.sessions;
+        if (!currentFrame) {
+            return undefined;
+        }
+        let variable: DebugVariable | undefined;
+        const scopes = await currentFrame.getScopes();
+        for (const scope of scopes) {
+            const found = await this.doFindVariable(scope, namesToFind);
+            if (!variable) {
+                variable = found;
+            } else if (found && found.value !== variable.value) {
+                // only show if all expressions found have the same value
+                return undefined;
+            }
+        }
+        return variable;
+    }
+    protected async doFindVariable(owner: ExpressionContainer, namesToFind: string[]): Promise<DebugVariable | undefined> {
+        const elements = await owner.getElements();
+        const variables: DebugVariable[] = [];
+        for (const element of elements) {
+            if (element instanceof DebugVariable && element.name === namesToFind[0]) {
+                variables.push(element);
+            }
+        }
+        if (variables.length !== 1) {
+            return undefined;
+        }
+        if (namesToFind.length === 1) {
+            return variables[0];
+        } else {
+            return this.doFindVariable(variables[0], namesToFind.slice(1));
+        }
+    }
+
+}