@theia/debug 1.34.3 → 1.34.4

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

@@ -1,121 +1,121 @@
-// *****************************************************************************
-// 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 { ReactWidget, QuickInputService } from '@theia/core/lib/browser';
-import { CommandRegistry, Disposable, DisposableCollection, MessageService } from '@theia/core/lib/common';
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import * as React from '@theia/core/shared/react';
-import { WorkspaceService } from '@theia/workspace/lib/browser';
-import { DebugConsoleContribution } from '../console/debug-console-contribution';
-import { DebugConfigurationManager } from '../debug-configuration-manager';
-import { DebugCommands } from '../debug-frontend-application-contribution';
-import { DebugSessionManager } from '../debug-session-manager';
-import { DebugAction } from './debug-action';
-import { DebugConfigurationSelect } from './debug-configuration-select';
-import { DebugViewModel } from './debug-view-model';
-import { nls } from '@theia/core/lib/common/nls';
-
-@injectable()
-export class DebugConfigurationWidget extends ReactWidget {
-
-    @inject(CommandRegistry)
-    protected readonly commandRegistry: CommandRegistry;
-
-    @inject(DebugViewModel)
-    protected readonly viewModel: DebugViewModel;
-
-    @inject(DebugConfigurationManager)
-    protected readonly manager: DebugConfigurationManager;
-
-    @inject(DebugSessionManager)
-    protected readonly sessionManager: DebugSessionManager;
-
-    @inject(DebugConsoleContribution)
-    protected readonly debugConsole: DebugConsoleContribution;
-
-    @inject(QuickInputService)
-    protected readonly quickInputService: QuickInputService;
-
-    @inject(WorkspaceService)
-    protected readonly workspaceService: WorkspaceService;
-
-    @inject(MessageService)
-    protected readonly messageService: MessageService;
-
-    protected readonly onRender = new DisposableCollection();
-
-    @postConstruct()
-    protected init(): void {
-        this.addClass('debug-toolbar');
-        this.toDispose.push(this.manager.onDidChange(() => this.update()));
-        this.toDispose.push(this.workspaceService.onWorkspaceChanged(() => this.update()));
-        this.toDispose.push(this.workspaceService.onWorkspaceLocationChanged(() => this.update()));
-        this.scrollOptions = undefined;
-        this.update();
-    }
-
-    focus(): void {
-        if (!this.doFocus()) {
-            this.onRender.push(Disposable.create(() => this.doFocus()));
-            this.update();
-        }
-    }
-    protected doFocus(): boolean {
-        if (!this.stepRef) {
-            return false;
-        }
-        this.stepRef.focus();
-        return true;
-    }
-
-    protected stepRef: DebugAction | undefined;
-    protected setStepRef = (stepRef: DebugAction | null) => {
-        this.stepRef = stepRef || undefined;
-        this.onRender.dispose();
-    };
-
-    render(): React.ReactNode {
-        return <React.Fragment>
-            <DebugAction run={this.start} label={nls.localizeByDefault('Start Debugging')} iconClass='debug-start' ref={this.setStepRef} />
-            <DebugConfigurationSelect
-                manager={this.manager}
-                quickInputService={this.quickInputService}
-                isMultiRoot={this.workspaceService.isMultiRootWorkspaceOpened}
-            />
-            <DebugAction run={this.openConfiguration} label={nls.localizeByDefault('Open {0}', '"launch.json"')}
-                iconClass='settings-gear' />
-            <DebugAction run={this.openConsole} label={nls.localizeByDefault('Debug Console')} iconClass='terminal' />
-        </React.Fragment>;
-    }
-
-    protected readonly start = async () => {
-        let configuration;
-        try {
-            configuration = await this.manager.getSelectedConfiguration();
-        } catch (e) {
-            this.messageService.error(e.message);
-            return;
-        }
-
-        this.commandRegistry.executeCommand(DebugCommands.START.id, configuration);
-    };
-
-    protected readonly openConfiguration = () => this.manager.openConfiguration();
-    protected readonly openConsole = () => this.debugConsole.openView({
-        activate: true
-    });
-
-}
+// *****************************************************************************
+// 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 { ReactWidget, QuickInputService } from '@theia/core/lib/browser';
+import { CommandRegistry, Disposable, DisposableCollection, MessageService } from '@theia/core/lib/common';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
+import { DebugConsoleContribution } from '../console/debug-console-contribution';
+import { DebugConfigurationManager } from '../debug-configuration-manager';
+import { DebugCommands } from '../debug-frontend-application-contribution';
+import { DebugSessionManager } from '../debug-session-manager';
+import { DebugAction } from './debug-action';
+import { DebugConfigurationSelect } from './debug-configuration-select';
+import { DebugViewModel } from './debug-view-model';
+import { nls } from '@theia/core/lib/common/nls';
+
+@injectable()
+export class DebugConfigurationWidget extends ReactWidget {
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(DebugViewModel)
+    protected readonly viewModel: DebugViewModel;
+
+    @inject(DebugConfigurationManager)
+    protected readonly manager: DebugConfigurationManager;
+
+    @inject(DebugSessionManager)
+    protected readonly sessionManager: DebugSessionManager;
+
+    @inject(DebugConsoleContribution)
+    protected readonly debugConsole: DebugConsoleContribution;
+
+    @inject(QuickInputService)
+    protected readonly quickInputService: QuickInputService;
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
+
+    protected readonly onRender = new DisposableCollection();
+
+    @postConstruct()
+    protected init(): void {
+        this.addClass('debug-toolbar');
+        this.toDispose.push(this.manager.onDidChange(() => this.update()));
+        this.toDispose.push(this.workspaceService.onWorkspaceChanged(() => this.update()));
+        this.toDispose.push(this.workspaceService.onWorkspaceLocationChanged(() => this.update()));
+        this.scrollOptions = undefined;
+        this.update();
+    }
+
+    focus(): void {
+        if (!this.doFocus()) {
+            this.onRender.push(Disposable.create(() => this.doFocus()));
+            this.update();
+        }
+    }
+    protected doFocus(): boolean {
+        if (!this.stepRef) {
+            return false;
+        }
+        this.stepRef.focus();
+        return true;
+    }
+
+    protected stepRef: DebugAction | undefined;
+    protected setStepRef = (stepRef: DebugAction | null) => {
+        this.stepRef = stepRef || undefined;
+        this.onRender.dispose();
+    };
+
+    render(): React.ReactNode {
+        return <React.Fragment>
+            <DebugAction run={this.start} label={nls.localizeByDefault('Start Debugging')} iconClass='debug-start' ref={this.setStepRef} />
+            <DebugConfigurationSelect
+                manager={this.manager}
+                quickInputService={this.quickInputService}
+                isMultiRoot={this.workspaceService.isMultiRootWorkspaceOpened}
+            />
+            <DebugAction run={this.openConfiguration} label={nls.localizeByDefault('Open {0}', '"launch.json"')}
+                iconClass='settings-gear' />
+            <DebugAction run={this.openConsole} label={nls.localizeByDefault('Debug Console')} iconClass='terminal' />
+        </React.Fragment>;
+    }
+
+    protected readonly start = async () => {
+        let configuration;
+        try {
+            configuration = await this.manager.getSelectedConfiguration();
+        } catch (e) {
+            this.messageService.error(e.message);
+            return;
+        }
+
+        this.commandRegistry.executeCommand(DebugCommands.START.id, configuration);
+    };
+
+    protected readonly openConfiguration = () => this.manager.openConfiguration();
+    protected readonly openConsole = () => this.debugConsole.openView({
+        activate: true
+    });
+
+}

package/src/browser/view/debug-exception-breakpoint.tsx

@@ -1,43 +1,43 @@
-// *****************************************************************************
-// 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 { TreeElement } from '@theia/core/lib/browser/source-tree';
-import { BreakpointManager } from '../breakpoint/breakpoint-manager';
-import { ExceptionBreakpoint } from '../breakpoint/breakpoint-marker';
-
-export class DebugExceptionBreakpoint implements TreeElement {
-
-    readonly id: string;
-
-    constructor(
-        readonly data: ExceptionBreakpoint,
-        readonly breakpoints: BreakpointManager
-    ) {
-        this.id = data.raw.filter + ':' + data.raw.label;
-    }
-
-    render(): React.ReactNode {
-        return <div title={this.data.raw.label} className='theia-source-breakpoint'>
-            <span className='theia-debug-breakpoint-icon' />
-            <input type='checkbox' checked={this.data.enabled} onChange={this.toggle} />
-            <span className='line-info'>{this.data.raw.label}</span>
-        </div>;
-    }
-
-    protected toggle = () => this.breakpoints.toggleExceptionBreakpoint(this.data.raw.filter);
-
-}
+// *****************************************************************************
+// 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 { TreeElement } from '@theia/core/lib/browser/source-tree';
+import { BreakpointManager } from '../breakpoint/breakpoint-manager';
+import { ExceptionBreakpoint } from '../breakpoint/breakpoint-marker';
+
+export class DebugExceptionBreakpoint implements TreeElement {
+
+    readonly id: string;
+
+    constructor(
+        readonly data: ExceptionBreakpoint,
+        readonly breakpoints: BreakpointManager
+    ) {
+        this.id = data.raw.filter + ':' + data.raw.label;
+    }
+
+    render(): React.ReactNode {
+        return <div title={this.data.raw.label} className='theia-source-breakpoint'>
+            <span className='theia-debug-breakpoint-icon' />
+            <input type='checkbox' checked={this.data.enabled} onChange={this.toggle} />
+            <span className='line-info'>{this.data.raw.label}</span>
+        </div>;
+    }
+
+    protected toggle = () => this.breakpoints.toggleExceptionBreakpoint(this.data.raw.filter);
+
+}

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

@@ -1,124 +1,124 @@
-// *****************************************************************************
-// 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 { inject, injectable, postConstruct, interfaces, Container } from '@theia/core/shared/inversify';
-import {
-    Message, ApplicationShell, Widget, BaseWidget, PanelLayout, StatefulWidget, ViewContainer, codicon, ViewContainerTitleOptions, WidgetManager
-} from '@theia/core/lib/browser';
-import { DebugThreadsWidget } from './debug-threads-widget';
-import { DebugStackFramesWidget } from './debug-stack-frames-widget';
-import { DebugBreakpointsWidget } from './debug-breakpoints-widget';
-import { DebugVariablesWidget } from './debug-variables-widget';
-import { DebugToolBar } from './debug-toolbar-widget';
-import { DebugViewModel } from './debug-view-model';
-import { DebugWatchWidget } from './debug-watch-widget';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
-
-export const DEBUG_VIEW_CONTAINER_TITLE_OPTIONS: ViewContainerTitleOptions = {
-    label: 'debug',
-    iconClass: codicon('debug-alt'),
-    closeable: true
-};
-
-@injectable()
-export class DebugSessionWidget extends BaseWidget implements StatefulWidget, ApplicationShell.TrackableWidgetProvider {
-
-    static createContainer(parent: interfaces.Container): Container {
-        const child = new Container({ defaultScope: 'Singleton' });
-        child.parent = parent;
-        child.bind(DebugViewModel).toSelf();
-        child.bind(DebugToolBar).toSelf();
-        child.bind(DebugSessionWidget).toSelf();
-        return child;
-    }
-
-    static createWidget(parent: interfaces.Container): DebugSessionWidget {
-        return DebugSessionWidget.createContainer(parent).get(DebugSessionWidget);
-    }
-
-    static subwidgets = [DebugThreadsWidget, DebugStackFramesWidget, DebugVariablesWidget, DebugWatchWidget, DebugBreakpointsWidget];
-
-    protected viewContainer: ViewContainer;
-
-    @inject(ViewContainer.Factory)
-    protected readonly viewContainerFactory: ViewContainer.Factory;
-
-    @inject(DebugViewModel)
-    readonly model: DebugViewModel;
-
-    @inject(DebugToolBar)
-    protected readonly toolbar: DebugToolBar;
-
-    @inject(WidgetManager) protected readonly widgetManager: WidgetManager;
-    @inject(FrontendApplicationStateService) protected readonly stateService: FrontendApplicationStateService;
-
-    @postConstruct()
-    protected init(): void {
-        this.id = 'debug:session:' + this.model.id;
-        this.title.label = this.model.label;
-        this.title.caption = this.model.label;
-        this.title.closable = true;
-        this.title.iconClass = codicon('debug-alt');
-        this.addClass('theia-session-container');
-
-        this.viewContainer = this.viewContainerFactory({
-            id: 'debug:view-container:' + this.model.id
-        });
-        this.viewContainer.setTitleOptions(DEBUG_VIEW_CONTAINER_TITLE_OPTIONS);
-        this.stateService.reachedState('initialized_layout').then(() => {
-            for (const subwidget of DebugSessionWidget.subwidgets) {
-                const widgetPromises = [];
-                const existingWidget = this.widgetManager.tryGetPendingWidget(subwidget.FACTORY_ID);
-                // No other view container instantiated this widget during startup.
-                if (!existingWidget) {
-                    widgetPromises.push(this.widgetManager.getOrCreateWidget(subwidget.FACTORY_ID));
-                }
-                Promise.all(widgetPromises).then(widgets => widgets.forEach(widget => this.viewContainer.addWidget(widget)));
-            }
-        });
-
-        this.toDispose.pushAll([
-            this.toolbar,
-            this.viewContainer
-        ]);
-
-        const layout = this.layout = new PanelLayout();
-        layout.addWidget(this.toolbar);
-        layout.addWidget(this.viewContainer);
-    }
-
-    protected override onActivateRequest(msg: Message): void {
-        super.onActivateRequest(msg);
-        this.toolbar.focus();
-    }
-
-    protected override onAfterShow(msg: Message): void {
-        super.onAfterShow(msg);
-        this.getTrackableWidgets().forEach(w => w.update());
-    }
-
-    getTrackableWidgets(): Widget[] {
-        return this.viewContainer.getTrackableWidgets();
-    }
-
-    storeState(): object {
-        return this.viewContainer.storeState();
-    }
-
-    restoreState(oldState: ViewContainer.State): void {
-        this.viewContainer.restoreState(oldState);
-    }
-}
+// *****************************************************************************
+// 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 { inject, injectable, postConstruct, interfaces, Container } from '@theia/core/shared/inversify';
+import {
+    Message, ApplicationShell, Widget, BaseWidget, PanelLayout, StatefulWidget, ViewContainer, codicon, ViewContainerTitleOptions, WidgetManager
+} from '@theia/core/lib/browser';
+import { DebugThreadsWidget } from './debug-threads-widget';
+import { DebugStackFramesWidget } from './debug-stack-frames-widget';
+import { DebugBreakpointsWidget } from './debug-breakpoints-widget';
+import { DebugVariablesWidget } from './debug-variables-widget';
+import { DebugToolBar } from './debug-toolbar-widget';
+import { DebugViewModel } from './debug-view-model';
+import { DebugWatchWidget } from './debug-watch-widget';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+
+export const DEBUG_VIEW_CONTAINER_TITLE_OPTIONS: ViewContainerTitleOptions = {
+    label: 'debug',
+    iconClass: codicon('debug-alt'),
+    closeable: true
+};
+
+@injectable()
+export class DebugSessionWidget extends BaseWidget implements StatefulWidget, ApplicationShell.TrackableWidgetProvider {
+
+    static createContainer(parent: interfaces.Container): Container {
+        const child = new Container({ defaultScope: 'Singleton' });
+        child.parent = parent;
+        child.bind(DebugViewModel).toSelf();
+        child.bind(DebugToolBar).toSelf();
+        child.bind(DebugSessionWidget).toSelf();
+        return child;
+    }
+
+    static createWidget(parent: interfaces.Container): DebugSessionWidget {
+        return DebugSessionWidget.createContainer(parent).get(DebugSessionWidget);
+    }
+
+    static subwidgets = [DebugThreadsWidget, DebugStackFramesWidget, DebugVariablesWidget, DebugWatchWidget, DebugBreakpointsWidget];
+
+    protected viewContainer: ViewContainer;
+
+    @inject(ViewContainer.Factory)
+    protected readonly viewContainerFactory: ViewContainer.Factory;
+
+    @inject(DebugViewModel)
+    readonly model: DebugViewModel;
+
+    @inject(DebugToolBar)
+    protected readonly toolbar: DebugToolBar;
+
+    @inject(WidgetManager) protected readonly widgetManager: WidgetManager;
+    @inject(FrontendApplicationStateService) protected readonly stateService: FrontendApplicationStateService;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = 'debug:session:' + this.model.id;
+        this.title.label = this.model.label;
+        this.title.caption = this.model.label;
+        this.title.closable = true;
+        this.title.iconClass = codicon('debug-alt');
+        this.addClass('theia-session-container');
+
+        this.viewContainer = this.viewContainerFactory({
+            id: 'debug:view-container:' + this.model.id
+        });
+        this.viewContainer.setTitleOptions(DEBUG_VIEW_CONTAINER_TITLE_OPTIONS);
+        this.stateService.reachedState('initialized_layout').then(() => {
+            for (const subwidget of DebugSessionWidget.subwidgets) {
+                const widgetPromises = [];
+                const existingWidget = this.widgetManager.tryGetPendingWidget(subwidget.FACTORY_ID);
+                // No other view container instantiated this widget during startup.
+                if (!existingWidget) {
+                    widgetPromises.push(this.widgetManager.getOrCreateWidget(subwidget.FACTORY_ID));
+                }
+                Promise.all(widgetPromises).then(widgets => widgets.forEach(widget => this.viewContainer.addWidget(widget)));
+            }
+        });
+
+        this.toDispose.pushAll([
+            this.toolbar,
+            this.viewContainer
+        ]);
+
+        const layout = this.layout = new PanelLayout();
+        layout.addWidget(this.toolbar);
+        layout.addWidget(this.viewContainer);
+    }
+
+    protected override onActivateRequest(msg: Message): void {
+        super.onActivateRequest(msg);
+        this.toolbar.focus();
+    }
+
+    protected override onAfterShow(msg: Message): void {
+        super.onAfterShow(msg);
+        this.getTrackableWidgets().forEach(w => w.update());
+    }
+
+    getTrackableWidgets(): Widget[] {
+        return this.viewContainer.getTrackableWidgets();
+    }
+
+    storeState(): object {
+        return this.viewContainer.storeState();
+    }
+
+    restoreState(oldState: ViewContainer.State): void {
+        this.viewContainer.restoreState(oldState);
+    }
+}