@theia/debug 1.53.0-next.5 → 1.53.0-next.55

package/src/browser/model/debug-breakpoint.tsx

@@ -1,151 +1,151 @@
-// *****************************************************************************
-// 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as React from '@theia/core/shared/react';
-import { DebugProtocol } from '@vscode/debugprotocol/lib/debugProtocol';
-import URI from '@theia/core/lib/common/uri';
-import { EditorManager } from '@theia/editor/lib/browser';
-import { LabelProvider, DISABLED_CLASS } from '@theia/core/lib/browser';
-import { TreeElement } from '@theia/core/lib/browser/source-tree';
-import { DebugSession } from '../debug-session';
-import { BaseBreakpoint } from '../breakpoint/breakpoint-marker';
-import { BreakpointManager } from '../breakpoint/breakpoint-manager';
-
-export class DebugBreakpointData {
-    readonly raw?: DebugProtocol.Breakpoint;
-}
-
-export class DebugBreakpointOptions {
-    readonly labelProvider: LabelProvider;
-    readonly breakpoints: BreakpointManager;
-    readonly editorManager: EditorManager;
-    readonly session?: DebugSession;
-}
-
-export class DebugBreakpointDecoration {
-    readonly className: string;
-    readonly message: string[];
-}
-
-export abstract class DebugBreakpoint<T extends BaseBreakpoint = BaseBreakpoint> extends DebugBreakpointOptions implements TreeElement {
-
-    readonly raw?: DebugProtocol.Breakpoint;
-
-    constructor(
-        readonly uri: URI,
-        options: DebugBreakpointOptions
-    ) {
-        super();
-        Object.assign(this, options);
-    }
-
-    abstract get origin(): T;
-
-    update(data: DebugBreakpointData): void {
-        Object.assign(this, data);
-    }
-
-    get idFromAdapter(): number | undefined {
-        return this.raw && this.raw.id;
-    }
-
-    get id(): string {
-        return this.origin.id;
-    }
-
-    get enabled(): boolean {
-        return this.breakpoints.breakpointsEnabled && this.origin.enabled;
-    }
-
-    get installed(): boolean {
-        return !!this.raw;
-    }
-
-    get verified(): boolean {
-        return !!this.raw ? this.raw.verified : true;
-    }
-
-    get message(): string {
-        return this.raw && this.raw.message || '';
-    }
-
-    abstract setEnabled(enabled: boolean): void;
-
-    abstract remove(): void;
-
-    protected readonly setBreakpointEnabled = (event: React.ChangeEvent<HTMLInputElement>) => {
-        this.setEnabled(event.target.checked);
-    };
-
-    render(): React.ReactNode {
-        const classNames = ['theia-source-breakpoint'];
-        if (!this.isEnabled()) {
-            classNames.push(DISABLED_CLASS);
-        }
-        const decoration = this.getDecoration();
-        return <div title={decoration.message.join('\n')} className={classNames.join(' ')}>
-            <span className={'theia-debug-breakpoint-icon codicon ' + decoration.className} />
-            <input className='theia-input' type='checkbox' checked={this.origin.enabled} onChange={this.setBreakpointEnabled} />
-            {this.doRender()}
-        </div>;
-    }
-
-    protected isEnabled(): boolean {
-        return this.breakpoints.breakpointsEnabled && this.verified;
-    }
-
-    protected abstract doRender(): React.ReactNode;
-
-    getDecoration(): DebugBreakpointDecoration {
-        if (!this.enabled) {
-            return this.getDisabledBreakpointDecoration();
-        }
-        if (this.installed && !this.verified) {
-            return this.getUnverifiedBreakpointDecoration();
-        }
-        return this.doGetDecoration();
-    }
-
-    protected getUnverifiedBreakpointDecoration(): DebugBreakpointDecoration {
-        const decoration = this.getBreakpointDecoration();
-        return {
-            className: decoration.className + '-unverified',
-            message: [this.message || 'Unverified ' + decoration.message[0]]
-        };
-    }
-
-    protected getDisabledBreakpointDecoration(message?: string): DebugBreakpointDecoration {
-        const decoration = this.getBreakpointDecoration();
-        return {
-            className: decoration.className + '-disabled',
-            message: [message || ('Disabled ' + decoration.message[0])]
-        };
-    }
-
-    protected doGetDecoration(messages: string[] = []): DebugBreakpointDecoration {
-        if (this.message) {
-            if (messages.length) {
-                messages[messages.length - 1].concat(', ' + this.message);
-            } else {
-                messages.push(this.message);
-            }
-        }
-        return this.getBreakpointDecoration(messages);
-    }
-
-    protected abstract getBreakpointDecoration(message?: string[]): DebugBreakpointDecoration;
-
-}
+// *****************************************************************************
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as React from '@theia/core/shared/react';
+import { DebugProtocol } from '@vscode/debugprotocol/lib/debugProtocol';
+import URI from '@theia/core/lib/common/uri';
+import { EditorManager } from '@theia/editor/lib/browser';
+import { LabelProvider, DISABLED_CLASS } from '@theia/core/lib/browser';
+import { TreeElement } from '@theia/core/lib/browser/source-tree';
+import { DebugSession } from '../debug-session';
+import { BaseBreakpoint } from '../breakpoint/breakpoint-marker';
+import { BreakpointManager } from '../breakpoint/breakpoint-manager';
+
+export class DebugBreakpointData {
+    readonly raw?: DebugProtocol.Breakpoint;
+}
+
+export class DebugBreakpointOptions {
+    readonly labelProvider: LabelProvider;
+    readonly breakpoints: BreakpointManager;
+    readonly editorManager: EditorManager;
+    readonly session?: DebugSession;
+}
+
+export class DebugBreakpointDecoration {
+    readonly className: string;
+    readonly message: string[];
+}
+
+export abstract class DebugBreakpoint<T extends BaseBreakpoint = BaseBreakpoint> extends DebugBreakpointOptions implements TreeElement {
+
+    readonly raw?: DebugProtocol.Breakpoint;
+
+    constructor(
+        readonly uri: URI,
+        options: DebugBreakpointOptions
+    ) {
+        super();
+        Object.assign(this, options);
+    }
+
+    abstract get origin(): T;
+
+    update(data: DebugBreakpointData): void {
+        Object.assign(this, data);
+    }
+
+    get idFromAdapter(): number | undefined {
+        return this.raw && this.raw.id;
+    }
+
+    get id(): string {
+        return this.origin.id;
+    }
+
+    get enabled(): boolean {
+        return this.breakpoints.breakpointsEnabled && this.origin.enabled;
+    }
+
+    get installed(): boolean {
+        return !!this.raw;
+    }
+
+    get verified(): boolean {
+        return !!this.raw ? this.raw.verified : true;
+    }
+
+    get message(): string {
+        return this.raw && this.raw.message || '';
+    }
+
+    abstract setEnabled(enabled: boolean): void;
+
+    abstract remove(): void;
+
+    protected readonly setBreakpointEnabled = (event: React.ChangeEvent<HTMLInputElement>) => {
+        this.setEnabled(event.target.checked);
+    };
+
+    render(): React.ReactNode {
+        const classNames = ['theia-source-breakpoint'];
+        if (!this.isEnabled()) {
+            classNames.push(DISABLED_CLASS);
+        }
+        const decoration = this.getDecoration();
+        return <div title={decoration.message.join('\n')} className={classNames.join(' ')}>
+            <span className={'theia-debug-breakpoint-icon codicon ' + decoration.className} />
+            <input className='theia-input' type='checkbox' checked={this.origin.enabled} onChange={this.setBreakpointEnabled} />
+            {this.doRender()}
+        </div>;
+    }
+
+    protected isEnabled(): boolean {
+        return this.breakpoints.breakpointsEnabled && this.verified;
+    }
+
+    protected abstract doRender(): React.ReactNode;
+
+    getDecoration(): DebugBreakpointDecoration {
+        if (!this.enabled) {
+            return this.getDisabledBreakpointDecoration();
+        }
+        if (this.installed && !this.verified) {
+            return this.getUnverifiedBreakpointDecoration();
+        }
+        return this.doGetDecoration();
+    }
+
+    protected getUnverifiedBreakpointDecoration(): DebugBreakpointDecoration {
+        const decoration = this.getBreakpointDecoration();
+        return {
+            className: decoration.className + '-unverified',
+            message: [this.message || 'Unverified ' + decoration.message[0]]
+        };
+    }
+
+    protected getDisabledBreakpointDecoration(message?: string): DebugBreakpointDecoration {
+        const decoration = this.getBreakpointDecoration();
+        return {
+            className: decoration.className + '-disabled',
+            message: [message || ('Disabled ' + decoration.message[0])]
+        };
+    }
+
+    protected doGetDecoration(messages: string[] = []): DebugBreakpointDecoration {
+        if (this.message) {
+            if (messages.length) {
+                messages[messages.length - 1].concat(', ' + this.message);
+            } else {
+                messages.push(this.message);
+            }
+        }
+        return this.getBreakpointDecoration(messages);
+    }
+
+    protected abstract getBreakpointDecoration(message?: string[]): DebugBreakpointDecoration;
+
+}

package/src/browser/model/debug-function-breakpoint.tsx

@@ -1,101 +1,101 @@
-// *****************************************************************************
-// 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as React from '@theia/core/shared/react';
-import { TreeElement } from '@theia/core/lib/browser/source-tree';
-import { FunctionBreakpoint } from '../breakpoint/breakpoint-marker';
-import { BreakpointManager } from '../breakpoint/breakpoint-manager';
-import { DebugBreakpoint, DebugBreakpointOptions, DebugBreakpointDecoration } from './debug-breakpoint';
-import { SingleTextInputDialog } from '@theia/core/lib/browser/dialogs';
-import { nls } from '@theia/core';
-
-export class DebugFunctionBreakpoint extends DebugBreakpoint<FunctionBreakpoint> implements TreeElement {
-
-    constructor(readonly origin: FunctionBreakpoint, options: DebugBreakpointOptions) {
-        super(BreakpointManager.FUNCTION_URI, options);
-    }
-
-    setEnabled(enabled: boolean): void {
-        const breakpoints = this.breakpoints.getFunctionBreakpoints();
-        const breakpoint = breakpoints.find(b => b.id === this.id);
-        if (breakpoint && breakpoint.enabled !== enabled) {
-            breakpoint.enabled = enabled;
-            this.breakpoints.setFunctionBreakpoints(breakpoints);
-        }
-    }
-
-    protected override isEnabled(): boolean {
-        return super.isEnabled() && this.isSupported();
-    }
-
-    protected isSupported(): boolean {
-        const { session } = this;
-        return !session || !!session.capabilities.supportsFunctionBreakpoints;
-    }
-
-    remove(): void {
-        const breakpoints = this.breakpoints.getFunctionBreakpoints();
-        const newBreakpoints = breakpoints.filter(b => b.id !== this.id);
-        if (breakpoints.length !== newBreakpoints.length) {
-            this.breakpoints.setFunctionBreakpoints(newBreakpoints);
-        }
-    }
-
-    get name(): string {
-        return this.origin.raw.name;
-    }
-
-    protected doRender(): React.ReactNode {
-        return <span className='line-info'>{this.name}</span>;
-    }
-
-    protected override doGetDecoration(): DebugBreakpointDecoration {
-        if (!this.isSupported()) {
-            return this.getDisabledBreakpointDecoration(nls.localizeByDefault('Function breakpoints are not supported by this debug type'));
-        }
-        return super.doGetDecoration();
-    }
-
-    protected getBreakpointDecoration(message?: string[]): DebugBreakpointDecoration {
-        return {
-            className: 'codicon-debug-breakpoint-function',
-            message: message || [nls.localizeByDefault('Function Breakpoint')]
-        };
-    }
-
-    async open(): Promise<void> {
-        const input = new SingleTextInputDialog({
-            title: nls.localizeByDefault('Add Function Breakpoint'),
-            initialValue: this.name
-        });
-        const newValue = await input.open();
-        if (newValue !== undefined && newValue !== this.name) {
-            const breakpoints = this.breakpoints.getFunctionBreakpoints();
-            const breakpoint = breakpoints.find(b => b.id === this.id);
-            if (breakpoint) {
-                if (breakpoint.raw.name !== newValue) {
-                    breakpoint.raw.name = newValue;
-                    this.breakpoints.setFunctionBreakpoints(breakpoints);
-                }
-            } else {
-                this.origin.raw.name = newValue;
-                breakpoints.push(this.origin);
-                this.breakpoints.setFunctionBreakpoints(breakpoints);
-            }
-        }
-    }
-
-}
+// *****************************************************************************
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as React from '@theia/core/shared/react';
+import { TreeElement } from '@theia/core/lib/browser/source-tree';
+import { FunctionBreakpoint } from '../breakpoint/breakpoint-marker';
+import { BreakpointManager } from '../breakpoint/breakpoint-manager';
+import { DebugBreakpoint, DebugBreakpointOptions, DebugBreakpointDecoration } from './debug-breakpoint';
+import { SingleTextInputDialog } from '@theia/core/lib/browser/dialogs';
+import { nls } from '@theia/core';
+
+export class DebugFunctionBreakpoint extends DebugBreakpoint<FunctionBreakpoint> implements TreeElement {
+
+    constructor(readonly origin: FunctionBreakpoint, options: DebugBreakpointOptions) {
+        super(BreakpointManager.FUNCTION_URI, options);
+    }
+
+    setEnabled(enabled: boolean): void {
+        const breakpoints = this.breakpoints.getFunctionBreakpoints();
+        const breakpoint = breakpoints.find(b => b.id === this.id);
+        if (breakpoint && breakpoint.enabled !== enabled) {
+            breakpoint.enabled = enabled;
+            this.breakpoints.setFunctionBreakpoints(breakpoints);
+        }
+    }
+
+    protected override isEnabled(): boolean {
+        return super.isEnabled() && this.isSupported();
+    }
+
+    protected isSupported(): boolean {
+        const { session } = this;
+        return !session || !!session.capabilities.supportsFunctionBreakpoints;
+    }
+
+    remove(): void {
+        const breakpoints = this.breakpoints.getFunctionBreakpoints();
+        const newBreakpoints = breakpoints.filter(b => b.id !== this.id);
+        if (breakpoints.length !== newBreakpoints.length) {
+            this.breakpoints.setFunctionBreakpoints(newBreakpoints);
+        }
+    }
+
+    get name(): string {
+        return this.origin.raw.name;
+    }
+
+    protected doRender(): React.ReactNode {
+        return <span className='line-info'>{this.name}</span>;
+    }
+
+    protected override doGetDecoration(): DebugBreakpointDecoration {
+        if (!this.isSupported()) {
+            return this.getDisabledBreakpointDecoration(nls.localizeByDefault('Function breakpoints are not supported by this debug type'));
+        }
+        return super.doGetDecoration();
+    }
+
+    protected getBreakpointDecoration(message?: string[]): DebugBreakpointDecoration {
+        return {
+            className: 'codicon-debug-breakpoint-function',
+            message: message || [nls.localizeByDefault('Function Breakpoint')]
+        };
+    }
+
+    async open(): Promise<void> {
+        const input = new SingleTextInputDialog({
+            title: nls.localizeByDefault('Add Function Breakpoint'),
+            initialValue: this.name
+        });
+        const newValue = await input.open();
+        if (newValue !== undefined && newValue !== this.name) {
+            const breakpoints = this.breakpoints.getFunctionBreakpoints();
+            const breakpoint = breakpoints.find(b => b.id === this.id);
+            if (breakpoint) {
+                if (breakpoint.raw.name !== newValue) {
+                    breakpoint.raw.name = newValue;
+                    this.breakpoints.setFunctionBreakpoints(breakpoints);
+                }
+            } else {
+                this.origin.raw.name = newValue;
+                breakpoints.push(this.origin);
+                this.breakpoints.setFunctionBreakpoints(breakpoints);
+            }
+        }
+    }
+
+}

package/src/browser/model/debug-instruction-breakpoint.tsx

@@ -1,68 +1,68 @@
-// *****************************************************************************
-// Copyright (C) 2022 Ericsson 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
-// *****************************************************************************
-
-import { nls } from '@theia/core';
-import * as React from '@theia/core/shared/react';
-import { BreakpointManager } from '../breakpoint/breakpoint-manager';
-import { InstructionBreakpoint } from '../breakpoint/breakpoint-marker';
-import { DebugBreakpoint, DebugBreakpointDecoration, DebugBreakpointOptions } from './debug-breakpoint';
-
-export class DebugInstructionBreakpoint extends DebugBreakpoint<InstructionBreakpoint> {
-    constructor(readonly origin: InstructionBreakpoint, options: DebugBreakpointOptions) {
-        super(BreakpointManager.INSTRUCTION_URI, options);
-    }
-
-    setEnabled(enabled: boolean): void {
-        if (enabled !== this.origin.enabled) {
-            this.breakpoints.updateInstructionBreakpoint(this.origin.id, { enabled });
-        }
-    }
-
-    protected override isEnabled(): boolean {
-        return super.isEnabled() && this.isSupported();
-    }
-
-    protected isSupported(): boolean {
-        return Boolean(this.session?.capabilities.supportsInstructionBreakpoints);
-    }
-
-    remove(): void {
-        this.breakpoints.removeInstructionBreakpoint(this.origin.instructionReference);
-    }
-
-    protected doRender(): React.ReactNode {
-        return <span className="line-info">{this.origin.instructionReference}</span>;
-    }
-
-    protected getBreakpointDecoration(message?: string[]): DebugBreakpointDecoration {
-        if (!this.isSupported()) {
-            return {
-                className: 'codicon-debug-breakpoint-unsupported',
-                message: message ?? [nls.localize('theia/debug/instruction-breakpoint', 'Instruction Breakpoint')],
-            };
-        }
-        if (this.origin.condition || this.origin.hitCondition) {
-            return {
-                className: 'codicon-debug-breakpoint-conditional',
-                message: message || [nls.localizeByDefault('Conditional Breakpoint...')]
-            };
-        }
-        return {
-            className: 'codicon-debug-breakpoint',
-            message: message || [nls.localize('theia/debug/instruction-breakpoint', 'Instruction Breakpoint')]
-        };
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2022 Ericsson 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
+// *****************************************************************************
+
+import { nls } from '@theia/core';
+import * as React from '@theia/core/shared/react';
+import { BreakpointManager } from '../breakpoint/breakpoint-manager';
+import { InstructionBreakpoint } from '../breakpoint/breakpoint-marker';
+import { DebugBreakpoint, DebugBreakpointDecoration, DebugBreakpointOptions } from './debug-breakpoint';
+
+export class DebugInstructionBreakpoint extends DebugBreakpoint<InstructionBreakpoint> {
+    constructor(readonly origin: InstructionBreakpoint, options: DebugBreakpointOptions) {
+        super(BreakpointManager.INSTRUCTION_URI, options);
+    }
+
+    setEnabled(enabled: boolean): void {
+        if (enabled !== this.origin.enabled) {
+            this.breakpoints.updateInstructionBreakpoint(this.origin.id, { enabled });
+        }
+    }
+
+    protected override isEnabled(): boolean {
+        return super.isEnabled() && this.isSupported();
+    }
+
+    protected isSupported(): boolean {
+        return Boolean(this.session?.capabilities.supportsInstructionBreakpoints);
+    }
+
+    remove(): void {
+        this.breakpoints.removeInstructionBreakpoint(this.origin.instructionReference);
+    }
+
+    protected doRender(): React.ReactNode {
+        return <span className="line-info">{this.origin.instructionReference}</span>;
+    }
+
+    protected getBreakpointDecoration(message?: string[]): DebugBreakpointDecoration {
+        if (!this.isSupported()) {
+            return {
+                className: 'codicon-debug-breakpoint-unsupported',
+                message: message ?? [nls.localize('theia/debug/instruction-breakpoint', 'Instruction Breakpoint')],
+            };
+        }
+        if (this.origin.condition || this.origin.hitCondition) {
+            return {
+                className: 'codicon-debug-breakpoint-conditional',
+                message: message || [nls.localizeByDefault('Conditional Breakpoint...')]
+            };
+        }
+        return {
+            className: 'codicon-debug-breakpoint',
+            message: message || [nls.localize('theia/debug/instruction-breakpoint', 'Instruction Breakpoint')]
+        };
+    }
+}