@theia/debug 1.18.0 → 1.21.0-next.12

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

@@ -20,6 +20,7 @@ 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 {
 
@@ -63,7 +64,7 @@ export class DebugFunctionBreakpoint extends DebugBreakpoint<FunctionBreakpoint>
 
     protected doGetDecoration(): DebugBreakpointDecoration {
         if (!this.isSupported()) {
-            return this.getDisabledBreakpointDecoration('Function breakpoints are not supported by this debug type');
+            return this.getDisabledBreakpointDecoration(nls.localizeByDefault('Function breakpoints are not supported by this debug type'));
         }
         return super.doGetDecoration();
     }
@@ -71,13 +72,13 @@ export class DebugFunctionBreakpoint extends DebugBreakpoint<FunctionBreakpoint>
     protected getBreakpointDecoration(message?: string[]): DebugBreakpointDecoration {
         return {
             className: 'theia-debug-function',
-            message: message || ['Function Breakpoint']
+            message: message || [nls.localizeByDefault('Function Breakpoint')]
         };
     }
 
     async open(): Promise<void> {
         const input = new SingleTextInputDialog({
-            title: 'Add Function Breakpoint',
+            title: nls.localizeByDefault('Add Function Breakpoint'),
             initialValue: this.name
         });
         const newValue = await input.open();

package/src/browser/preferences/launch-preferences.ts

@@ -18,6 +18,7 @@ import { interfaces } from '@theia/core/shared/inversify';
 import { PreferenceContribution, PreferenceSchema } from '@theia/core/lib/browser/preferences/preference-contribution';
 import { launchSchemaId } from '../debug-schema-updater';
 import { PreferenceConfiguration } from '@theia/core/lib/browser/preferences/preference-configurations';
+import { nls } from '@theia/core/lib/common/nls';
 
 export const launchPreferencesSchema: PreferenceSchema = {
     type: 'object',
@@ -25,7 +26,7 @@ export const launchPreferencesSchema: PreferenceSchema = {
     properties: {
         'launch': {
             $ref: launchSchemaId,
-            description: "Global debug launch configuration. Should be used as an alternative to 'launch.json' that is shared across workspaces",
+            description: nls.localizeByDefault("Global debug launch configuration. Should be used as an alternative to 'launch.json' that is shared across workspaces."),
             defaultValue: { configurations: [], compounds: [] }
         }
     }

package/src/browser/view/debug-breakpoints-source.tsx

@@ -29,12 +29,6 @@ export class DebugBreakpointsSource extends TreeSource {
     @inject(BreakpointManager)
     protected readonly breakpoints: BreakpointManager;
 
-    constructor() {
-        super({
-            placeholder: 'No breakpoints'
-        });
-    }
-
     @postConstruct()
     protected init(): void {
         this.fireDidChange();

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

@@ -21,6 +21,7 @@ import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
 import { DebugBreakpointsSource } from './debug-breakpoints-source';
 import { BreakpointManager } from '../breakpoint/breakpoint-manager';
 import { DebugViewModel } from './debug-view-model';
+import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class DebugBreakpointsWidget extends SourceTreeWidget {
@@ -57,7 +58,7 @@ export class DebugBreakpointsWidget extends SourceTreeWidget {
     protected init(): void {
         super.init();
         this.id = 'debug:breakpoints:' + this.viewModel.id;
-        this.title.label = 'Breakpoints';
+        this.title.label = nls.localizeByDefault('Breakpoints');
         this.toDispose.push(this.breakpointsSource);
         this.source = this.breakpointsSource;
     }

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

@@ -16,7 +16,7 @@
 
 import * as React from '@theia/core/shared/react';
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { Disposable } from '@theia/core/lib/common';
+import { CommandRegistry, Disposable } from '@theia/core/lib/common';
 import URI from '@theia/core/lib/common/uri';
 import { ReactWidget } from '@theia/core/lib/browser';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
@@ -27,7 +27,7 @@ import { DebugAction } from './debug-action';
 import { DebugViewModel } from './debug-view-model';
 import { DebugSessionOptions } from '../debug-session-options';
 import { DebugCommands } from '../debug-frontend-application-contribution';
-import { CommandRegistry } from '@theia/core/lib/common';
+import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class DebugConfigurationWidget extends ReactWidget {
@@ -79,14 +79,15 @@ export class DebugConfigurationWidget extends ReactWidget {
     render(): React.ReactNode {
         const { options } = this;
         return <React.Fragment>
-            <DebugAction run={this.start} label='Start Debugging' iconClass='debug-start' ref={this.setStepRef} />
+            <DebugAction run={this.start} label={nls.localizeByDefault('Start Debugging')} iconClass='debug-start' ref={this.setStepRef} />
             <select className='theia-select debug-configuration' value={this.currentValue} onChange={this.setCurrentConfiguration}>
-                {options.length ? options : <option value='__NO_CONF__'>No Configurations</option>}
+                {options.length ? options : <option value='__NO_CONF__'>{nls.localizeByDefault('No Configurations')}</option>}
                 <option disabled>{'Add Configuration...'.replace(/./g, '-')}</option>
-                <option value='__ADD_CONF__'>Add Configuration...</option>
+                <option value='__ADD_CONF__'>{nls.localizeByDefault('Add Configuration...')}</option>
             </select>
-            <DebugAction run={this.openConfiguration} label='Open launch.json' iconClass='settings-gear' />
-            <DebugAction run={this.openConsole} label='Debug Console' iconClass='terminal' />
+            <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 get currentValue(): string {

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

@@ -16,7 +16,7 @@
 
 import { inject, injectable, postConstruct, interfaces, Container } from '@theia/core/shared/inversify';
 import {
-    Message, ApplicationShell, Widget, BaseWidget, PanelLayout, StatefulWidget, ViewContainer, codicon
+    Message, ApplicationShell, Widget, BaseWidget, PanelLayout, StatefulWidget, ViewContainer, codicon, ViewContainerTitleOptions
 } from '@theia/core/lib/browser';
 import { DebugThreadsWidget } from './debug-threads-widget';
 import { DebugStackFramesWidget } from './debug-stack-frames-widget';
@@ -28,6 +28,11 @@ import { DebugWatchWidget } from './debug-watch-widget';
 
 export const DebugSessionWidgetFactory = Symbol('DebugSessionWidgetFactory');
 export type DebugSessionWidgetFactory = (options: DebugViewOptions) => DebugSessionWidget;
+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 {
@@ -88,11 +93,12 @@ export class DebugSessionWidget extends BaseWidget implements StatefulWidget, Ap
         this.viewContainer = this.viewContainerFactory({
             id: 'debug:view-container:' + this.model.id
         });
-        this.viewContainer.addWidget(this.threads, { weight: 30 });
-        this.viewContainer.addWidget(this.stackFrames, { weight: 20 });
-        this.viewContainer.addWidget(this.variables, { weight: 10 });
-        this.viewContainer.addWidget(this.watch, { weight: 10 });
-        this.viewContainer.addWidget(this.breakpoints, { weight: 10 });
+        this.viewContainer.setTitleOptions(DEBUG_VIEW_CONTAINER_TITLE_OPTIONS);
+        this.viewContainer.addWidget(this.threads, { weight: 30, disableDraggingToOtherContainers: true });
+        this.viewContainer.addWidget(this.stackFrames, { weight: 20, disableDraggingToOtherContainers: true });
+        this.viewContainer.addWidget(this.variables, { weight: 10, disableDraggingToOtherContainers: true });
+        this.viewContainer.addWidget(this.watch, { weight: 10, disableDraggingToOtherContainers: true });
+        this.viewContainer.addWidget(this.breakpoints, { weight: 10, disableDraggingToOtherContainers: true });
 
         this.toDispose.pushAll([
             this.toolbar,

package/src/browser/view/debug-stack-frames-source.tsx

@@ -27,12 +27,6 @@ export class DebugStackFramesSource extends TreeSource {
     @inject(DebugViewModel)
     protected readonly model: DebugViewModel;
 
-    constructor() {
-        super({
-            placeholder: 'Not paused'
-        });
-    }
-
     @postConstruct()
     protected init(): void {
         this.refresh();

package/src/browser/view/debug-stack-frames-widget.ts

@@ -22,6 +22,7 @@ import { DebugStackFramesSource, LoadMoreStackFrames } from './debug-stack-frame
 import { DebugStackFrame } from '../model/debug-stack-frame';
 import { DebugViewModel } from './debug-view-model';
 import { DebugCallStackItemTypeKey } from '../debug-call-stack-item-type-key';
+import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class DebugStackFramesWidget extends SourceTreeWidget {
@@ -55,7 +56,7 @@ export class DebugStackFramesWidget extends SourceTreeWidget {
     protected init(): void {
         super.init();
         this.id = 'debug:frames:' + this.viewModel.id;
-        this.title.label = 'Call Stack';
+        this.title.label = nls.localizeByDefault('Call Stack');
         this.toDispose.push(this.frames);
         this.source = this.frames;
 

package/src/browser/view/debug-threads-source.tsx

@@ -24,12 +24,6 @@ export class DebugThreadsSource extends TreeSource {
     @inject(DebugViewModel)
     protected readonly model: DebugViewModel;
 
-    constructor() {
-        super({
-            placeholder: 'Not running'
-        });
-    }
-
     @postConstruct()
     protected init(): void {
         this.fireDidChange();

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

@@ -23,6 +23,7 @@ import { DebugSession } from '../debug-session';
 import { DebugThread } from '../model/debug-thread';
 import { DebugViewModel } from '../view/debug-view-model';
 import { DebugCallStackItemTypeKey } from '../debug-call-stack-item-type-key';
+import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class DebugThreadsWidget extends SourceTreeWidget {
@@ -59,7 +60,7 @@ export class DebugThreadsWidget extends SourceTreeWidget {
     protected init(): void {
         super.init();
         this.id = 'debug:threads:' + this.viewModel.id;
-        this.title.label = 'Threads';
+        this.title.label = nls.localize('theia/debug/threads', 'Threads');
         this.toDispose.push(this.threads);
         this.source = this.threads;
 

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

@@ -21,6 +21,7 @@ import { ReactWidget } from '@theia/core/lib/browser/widgets';
 import { DebugViewModel } from './debug-view-model';
 import { DebugState } from '../debug-session';
 import { DebugAction } from './debug-action';
+import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class DebugToolBar extends ReactWidget {
@@ -58,26 +59,30 @@ export class DebugToolBar extends ReactWidget {
         const { state } = this.model;
         return <React.Fragment>
             {this.renderContinue()}
-            <DebugAction enabled={state === DebugState.Stopped} run={this.stepOver} label='Step Over' iconClass='debug-step-over' ref={this.setStepRef} />
-            <DebugAction enabled={state === DebugState.Stopped} run={this.stepIn} label='Step Into' iconClass='debug-step-into' />
-            <DebugAction enabled={state === DebugState.Stopped} run={this.stepOut} label='Step Out' iconClass='debug-step-out' />
-            <DebugAction enabled={state !== DebugState.Inactive} run={this.restart} label='Restart' iconClass='debug-restart' />
+            <DebugAction enabled={state === DebugState.Stopped} run={this.stepOver} label={nls.localizeByDefault('Step Over')}
+                iconClass='debug-step-over' ref={this.setStepRef} />
+            <DebugAction enabled={state === DebugState.Stopped} run={this.stepIn} label={nls.localizeByDefault('Step Into')}
+                iconClass='debug-step-into' />
+            <DebugAction enabled={state === DebugState.Stopped} run={this.stepOut} label={nls.localizeByDefault('Step Out')}
+                iconClass='debug-step-out' />
+            <DebugAction enabled={state !== DebugState.Inactive} run={this.restart} label={nls.localizeByDefault('Restart')}
+                iconClass='debug-restart' />
             {this.renderStart()}
         </React.Fragment>;
     }
     protected renderStart(): React.ReactNode {
         const { state } = this.model;
         if (state === DebugState.Inactive && this.model.sessionCount === 1) {
-            return <DebugAction run={this.start} label='Start' iconClass='debug-start' />;
+            return <DebugAction run={this.start} label={nls.localizeByDefault('Start')} iconClass='debug-start' />;
         }
-        return <DebugAction enabled={state !== DebugState.Inactive} run={this.stop} label='Stop' iconClass='debug-stop' />;
+        return <DebugAction enabled={state !== DebugState.Inactive} run={this.stop} label={nls.localizeByDefault('Stop')} iconClass='debug-stop' />;
     }
     protected renderContinue(): React.ReactNode {
         const { state } = this.model;
         if (state === DebugState.Stopped) {
-            return <DebugAction run={this.continue} label='Continue' iconClass='debug-continue' />;
+            return <DebugAction run={this.continue} label={nls.localizeByDefault('Continue')} iconClass='debug-continue' />;
         }
-        return <DebugAction enabled={state === DebugState.Running} run={this.pause} label='Pause' iconClass='debug-pause' />;
+        return <DebugAction enabled={state === DebugState.Running} run={this.pause} label={nls.localizeByDefault('Pause')} iconClass='debug-pause' />;
     }
 
     protected start = () => this.model.start();

package/src/browser/view/debug-variables-source.ts

@@ -26,12 +26,6 @@ export class DebugVariablesSource extends TreeSource {
     @inject(DebugViewModel)
     protected readonly model: DebugViewModel;
 
-    constructor() {
-        super({
-            placeholder: 'Not paused'
-        });
-    }
-
     @postConstruct()
     protected init(): void {
         this.refresh();

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

@@ -19,6 +19,7 @@ import { MenuPath } from '@theia/core/lib/common';
 import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
 import { DebugVariablesSource } from './debug-variables-source';
 import { DebugViewModel } from './debug-view-model';
+import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class DebugVariablesWidget extends SourceTreeWidget {
@@ -51,7 +52,7 @@ export class DebugVariablesWidget extends SourceTreeWidget {
     protected init(): void {
         super.init();
         this.id = 'debug:variables:' + this.viewModel.id;
-        this.title.label = 'Variables';
+        this.title.label = nls.localizeByDefault('Variables');
         this.toDispose.push(this.variables);
         this.source = this.variables;
     }

package/src/browser/view/debug-view-model.ts

@@ -181,8 +181,8 @@ export class DebugViewModel implements Disposable {
         if (!session) {
             return;
         }
-        const newSession = await this.manager.restart(session);
-        if (newSession !== session) {
+        const newSession = await this.manager.restartSession(session);
+        if (newSession && newSession !== session) {
             this._sessions.delete(session);
             this._sessions.add(newSession);
         }
@@ -190,7 +190,7 @@ export class DebugViewModel implements Disposable {
     }
 
     async terminate(): Promise<void> {
-        this.manager.terminateSessions();
+        this.manager.terminateSession();
     }
 
     get watchExpressions(): IterableIterator<DebugWatchExpression> {

package/src/browser/view/debug-watch-source.ts

@@ -26,12 +26,6 @@ export class DebugWatchSource extends TreeSource {
     @inject(DebugViewModel)
     protected readonly model: DebugViewModel;
 
-    constructor() {
-        super({
-            placeholder: 'No expressions'
-        });
-    }
-
     @postConstruct()
     protected init(): void {
         this.refresh();

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

@@ -19,6 +19,7 @@ import { MenuPath } from '@theia/core/lib/common';
 import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
 import { DebugWatchSource } from './debug-watch-source';
 import { DebugViewModel } from './debug-view-model';
+import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class DebugWatchWidget extends SourceTreeWidget {
@@ -51,7 +52,7 @@ export class DebugWatchWidget extends SourceTreeWidget {
     protected init(): void {
         super.init();
         this.id = 'debug:watch:' + this.viewModel.id;
-        this.title.label = 'Watch';
+        this.title.label = nls.localizeByDefault('Watch');
         this.toDispose.push(this.variables);
         this.source = this.variables;
     }

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

@@ -23,6 +23,7 @@ import { DebugConfigurationWidget } from './debug-configuration-widget';
 import { DebugViewModel } from './debug-view-model';
 import { DebugSessionManager } from '../debug-session-manager';
 import { ProgressBarFactory } from '@theia/core/lib/browser/progress-bar-factory';
+import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class DebugWidget extends BaseWidget implements StatefulWidget, ApplicationShell.TrackableWidgetProvider {
@@ -38,7 +39,7 @@ export class DebugWidget extends BaseWidget implements StatefulWidget, Applicati
     }
 
     static ID = 'debug';
-    static LABEL = 'Debug';
+    static LABEL = nls.localizeByDefault('Debug');
 
     @inject(DebugViewModel)
     readonly model: DebugViewModel;

package/src/common/debug-service.ts

@@ -116,3 +116,16 @@ export namespace DebugError {
         data: { type }
     }));
 }
+
+/**
+ * A closeable channel to send messages over with error/close handling
+ */
+export interface Channel {
+    send(content: string): void;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    onMessage(cb: (data: any) => void): void;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    onError(cb: (reason: any) => void): void;
+    onClose(cb: (code: number, reason: string) => void): void;
+    close(): void;
+}

package/src/node/debug-adapter-contribution-registry.ts

@@ -19,7 +19,7 @@ import { ContributionProvider } from '@theia/core';
 import { DebugConfiguration } from '../common/debug-configuration';
 import { DebuggerDescription, DebugError } from '../common/debug-service';
 
-import { DebugAdapterContribution, DebugAdapterExecutable, DebugAdapterSessionFactory } from '../common/debug-model';
+import { DebugAdapterContribution, DebugAdapterExecutable, DebugAdapterSessionFactory } from './debug-model';
 import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-schema';
 
 /**

package/src/node/debug-adapter-factory.ts

@@ -32,14 +32,15 @@ import {
 } from '@theia/process/lib/node';
 import {
     DebugAdapterExecutable,
-    CommunicationProvider,
     DebugAdapterSession,
     DebugAdapterSessionFactory,
     DebugAdapterFactory,
-    DebugAdapterForkExecutable
-} from '../common/debug-model';
+    DebugAdapterForkExecutable,
+    DebugAdapter
+} from './debug-model';
 import { DebugAdapterSessionImpl } from './debug-adapter-session';
 import { environment } from '@theia/core/shared/@theia/application-package';
+import { ProcessDebugAdapter, SocketDebugAdapter } from './stream-debug-adapter';
 
 /**
  * [DebugAdapterFactory](#DebugAdapterFactory) implementation based on
@@ -52,15 +53,16 @@ export class LaunchBasedDebugAdapterFactory implements DebugAdapterFactory {
     @inject(ProcessManager)
     protected readonly processManager: ProcessManager;
 
-    start(executable: DebugAdapterExecutable): CommunicationProvider {
+    start(executable: DebugAdapterExecutable): DebugAdapter {
         const process = this.childProcess(executable);
 
+        if (!process.process) {
+            throw new Error(`Could not start debug adapter process: ${JSON.stringify(executable)}`);
+        }
+
         // FIXME: propagate onError + onExit
-        return {
-            input: process.inputStream,
-            output: process.outputStream,
-            dispose: () => process.kill()
-        };
+        const provider = new ProcessDebugAdapter(process.process);
+        return provider;
     }
 
     private childProcess(executable: DebugAdapterExecutable): RawProcess {
@@ -81,14 +83,12 @@ export class LaunchBasedDebugAdapterFactory implements DebugAdapterFactory {
         return this.processFactory(processOptions);
     }
 
-    connect(debugServerPort: number): CommunicationProvider {
+    connect(debugServerPort: number): DebugAdapter {
         const socket = net.createConnection(debugServerPort);
         // FIXME: propagate socket.on('error', ...) + socket.on('close', ...)
-        return {
-            input: socket,
-            output: socket,
-            dispose: () => socket.end()
-        };
+
+        const provider = new SocketDebugAdapter(socket);
+        return provider;
     }
 }
 
@@ -98,10 +98,10 @@ export class LaunchBasedDebugAdapterFactory implements DebugAdapterFactory {
 @injectable()
 export class DebugAdapterSessionFactoryImpl implements DebugAdapterSessionFactory {
 
-    get(sessionId: string, communicationProvider: CommunicationProvider): DebugAdapterSession {
+    get(sessionId: string, debugAdapter: DebugAdapter): DebugAdapterSession {
         return new DebugAdapterSessionImpl(
             sessionId,
-            communicationProvider
+            debugAdapter
         );
     }
 }

package/src/node/debug-adapter-session-manager.ts

@@ -20,7 +20,7 @@ import { MessagingService } from '@theia/core/lib/node/messaging/messaging-servi
 
 import { DebugAdapterPath } from '../common/debug-service';
 import { DebugConfiguration } from '../common/debug-configuration';
-import { DebugAdapterSession, DebugAdapterSessionFactory, DebugAdapterFactory } from '../common/debug-model';
+import { DebugAdapterSession, DebugAdapterSessionFactory, DebugAdapterFactory } from './debug-model';
 import { DebugAdapterContributionRegistry } from './debug-adapter-contribution-registry';
 
 /**
@@ -43,7 +43,6 @@ export class DebugAdapterSessionManager implements MessagingService.Contribution
                 channel.close();
                 return;
             }
-            channel.onClose(() => session.stop());
             session.start(channel);
         });
     }