@theia/debug 1.45.0 → 1.46.0-next.72

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

@@ -1,107 +1,107 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// Some entities copied and modified from https://github.com/Microsoft/vscode-debugadapter-node/blob/master/adapter/src/protocol.ts
-
-import * as net from 'net';
-import { injectable, inject } from '@theia/core/shared/inversify';
-import {
-    RawProcessFactory,
-    ProcessManager,
-    RawProcess,
-    RawForkOptions,
-    RawProcessOptions
-} from '@theia/process/lib/node';
-import {
-    DebugAdapterExecutable,
-    DebugAdapterSession,
-    DebugAdapterSessionFactory,
-    DebugAdapterFactory,
-    DebugAdapterForkExecutable,
-    DebugAdapter
-} from '../common/debug-model';
-import { DebugAdapterSessionImpl } from '../common/debug-adapter-session';
-import { environment } from '@theia/core/shared/@theia/application-package';
-import { ProcessDebugAdapter, SocketDebugAdapter } from './stream-debug-adapter';
-import { isObject } from '@theia/core/lib/common';
-
-/**
- * [DebugAdapterFactory](#DebugAdapterFactory) implementation based on
- * launching the debug adapter as separate process.
- */
-@injectable()
-export class LaunchBasedDebugAdapterFactory implements DebugAdapterFactory {
-    @inject(RawProcessFactory)
-    protected readonly processFactory: RawProcessFactory;
-    @inject(ProcessManager)
-    protected readonly processManager: ProcessManager;
-
-    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
-        const provider = new ProcessDebugAdapter(process.process);
-        return provider;
-    }
-
-    private childProcess(executable: DebugAdapterExecutable): RawProcess {
-        const isForkOptions = (forkOptions: unknown): forkOptions is RawForkOptions =>
-            isObject(forkOptions) && 'modulePath' in forkOptions;
-
-        const processOptions: RawProcessOptions | RawForkOptions = { ...executable };
-        const options: { stdio: (string | number)[], env?: object, execArgv?: string[] } = { stdio: ['pipe', 'pipe', 2] };
-
-        if (isForkOptions(processOptions)) {
-            options.stdio.push('ipc');
-            options.env = environment.electron.runAsNodeEnv();
-            options.execArgv = (executable as DebugAdapterForkExecutable).execArgv;
-        }
-
-        processOptions.options = options;
-        return this.processFactory(processOptions);
-    }
-
-    connect(debugServerPort: number): DebugAdapter {
-        const socket = net.createConnection(debugServerPort);
-        // FIXME: propagate socket.on('error', ...) + socket.on('close', ...)
-
-        const provider = new SocketDebugAdapter(socket);
-        return provider;
-    }
-}
-
-/**
- * [DebugAdapterSessionFactory](#DebugAdapterSessionFactory) implementation.
- */
-@injectable()
-export class DebugAdapterSessionFactoryImpl implements DebugAdapterSessionFactory {
-
-    get(sessionId: string, debugAdapter: DebugAdapter): DebugAdapterSession {
-        return new DebugAdapterSessionImpl(
-            sessionId,
-            debugAdapter
-        );
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Some entities copied and modified from https://github.com/Microsoft/vscode-debugadapter-node/blob/master/adapter/src/protocol.ts
+
+import * as net from 'net';
+import { injectable, inject } from '@theia/core/shared/inversify';
+import {
+    RawProcessFactory,
+    ProcessManager,
+    RawProcess,
+    RawForkOptions,
+    RawProcessOptions
+} from '@theia/process/lib/node';
+import {
+    DebugAdapterExecutable,
+    DebugAdapterSession,
+    DebugAdapterSessionFactory,
+    DebugAdapterFactory,
+    DebugAdapterForkExecutable,
+    DebugAdapter
+} from '../common/debug-model';
+import { DebugAdapterSessionImpl } from '../common/debug-adapter-session';
+import { environment } from '@theia/core/shared/@theia/application-package';
+import { ProcessDebugAdapter, SocketDebugAdapter } from './stream-debug-adapter';
+import { isObject } from '@theia/core/lib/common';
+
+/**
+ * [DebugAdapterFactory](#DebugAdapterFactory) implementation based on
+ * launching the debug adapter as separate process.
+ */
+@injectable()
+export class LaunchBasedDebugAdapterFactory implements DebugAdapterFactory {
+    @inject(RawProcessFactory)
+    protected readonly processFactory: RawProcessFactory;
+    @inject(ProcessManager)
+    protected readonly processManager: ProcessManager;
+
+    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
+        const provider = new ProcessDebugAdapter(process.process);
+        return provider;
+    }
+
+    private childProcess(executable: DebugAdapterExecutable): RawProcess {
+        const isForkOptions = (forkOptions: unknown): forkOptions is RawForkOptions =>
+            isObject(forkOptions) && 'modulePath' in forkOptions;
+
+        const processOptions: RawProcessOptions | RawForkOptions = { ...executable };
+        const options: { stdio: (string | number)[], env?: object, execArgv?: string[] } = { stdio: ['pipe', 'pipe', 2] };
+
+        if (isForkOptions(processOptions)) {
+            options.stdio.push('ipc');
+            options.env = environment.electron.runAsNodeEnv();
+            options.execArgv = (executable as DebugAdapterForkExecutable).execArgv;
+        }
+
+        processOptions.options = options;
+        return this.processFactory(processOptions);
+    }
+
+    connect(debugServerPort: number): DebugAdapter {
+        const socket = net.createConnection(debugServerPort);
+        // FIXME: propagate socket.on('error', ...) + socket.on('close', ...)
+
+        const provider = new SocketDebugAdapter(socket);
+        return provider;
+    }
+}
+
+/**
+ * [DebugAdapterSessionFactory](#DebugAdapterSessionFactory) implementation.
+ */
+@injectable()
+export class DebugAdapterSessionFactoryImpl implements DebugAdapterSessionFactory {
+
+    get(sessionId: string, debugAdapter: DebugAdapter): DebugAdapterSession {
+        return new DebugAdapterSessionImpl(
+            sessionId,
+            debugAdapter
+        );
+    }
+}

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

@@ -1,106 +1,106 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { UUID } from '@theia/core/shared/@phosphor/coreutils';
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { MessagingService } from '@theia/core/lib/node/messaging/messaging-service';
-
-import { DebugAdapterPath, ForwardingDebugChannel } from '../common/debug-service';
-import { DebugConfiguration } from '../common/debug-configuration';
-import { DebugAdapterSession, DebugAdapterSessionFactory, DebugAdapterFactory } from '../common/debug-model';
-import { DebugAdapterContributionRegistry } from '../common/debug-adapter-contribution-registry';
-
-/**
- * Debug adapter session manager.
- */
-@injectable()
-export class DebugAdapterSessionManager implements MessagingService.Contribution {
-    protected readonly sessions = new Map<string, DebugAdapterSession>();
-
-    @inject(DebugAdapterSessionFactory)
-    protected readonly debugAdapterSessionFactory: DebugAdapterSessionFactory;
-
-    @inject(DebugAdapterFactory)
-    protected readonly debugAdapterFactory: DebugAdapterFactory;
-
-    configure(service: MessagingService): void {
-        service.registerChannelHandler(`${DebugAdapterPath}/:id`, ({ id }: { id: string }, wsChannel) => {
-            const session = this.find(id);
-            if (!session) {
-                wsChannel.close();
-                return;
-            }
-            session.start(new ForwardingDebugChannel(wsChannel));
-        });
-    }
-
-    /**
-     * Creates a new [debug adapter session](#DebugAdapterSession).
-     * @param config The [DebugConfiguration](#DebugConfiguration)
-     * @returns The debug adapter session
-     */
-    async create(config: DebugConfiguration, registry: DebugAdapterContributionRegistry): Promise<DebugAdapterSession> {
-        const sessionId = UUID.uuid4();
-
-        let communicationProvider;
-        if ('debugServer' in config) {
-            communicationProvider = this.debugAdapterFactory.connect(config.debugServer);
-        } else {
-            const executable = await registry.provideDebugAdapterExecutable(config);
-            communicationProvider = this.debugAdapterFactory.start(executable);
-        }
-
-        const sessionFactory = registry.debugAdapterSessionFactory(config.type) || this.debugAdapterSessionFactory;
-        const session = sessionFactory.get(sessionId, communicationProvider);
-        this.sessions.set(sessionId, session);
-
-        if (config.parentSession) {
-            const parentSession = this.sessions.get(config.parentSession.id);
-            if (parentSession) {
-                session.parentSession = parentSession;
-            }
-        }
-
-        return session;
-    }
-
-    /**
-     * Removes [debug adapter session](#DebugAdapterSession) from the list of the instantiated sessions.
-     * Is invoked when session is terminated and isn't needed anymore.
-     * @param sessionId The session identifier
-     */
-    remove(sessionId: string): void {
-        this.sessions.delete(sessionId);
-    }
-
-    /**
-     * Finds the debug adapter session by its id.
-     * Returning the value 'undefined' means the session isn't found.
-     * @param sessionId The session identifier
-     * @returns The debug adapter session
-     */
-    find(sessionId: string): DebugAdapterSession | undefined {
-        return this.sessions.get(sessionId);
-    }
-
-    /**
-     * Returns all instantiated debug adapter sessions.
-     * @returns An array of debug adapter sessions
-     */
-    getAll(): IterableIterator<DebugAdapterSession> {
-        return this.sessions.values();
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { UUID } from '@theia/core/shared/@phosphor/coreutils';
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { MessagingService } from '@theia/core/lib/node/messaging/messaging-service';
+
+import { DebugAdapterPath, ForwardingDebugChannel } from '../common/debug-service';
+import { DebugConfiguration } from '../common/debug-configuration';
+import { DebugAdapterSession, DebugAdapterSessionFactory, DebugAdapterFactory } from '../common/debug-model';
+import { DebugAdapterContributionRegistry } from '../common/debug-adapter-contribution-registry';
+
+/**
+ * Debug adapter session manager.
+ */
+@injectable()
+export class DebugAdapterSessionManager implements MessagingService.Contribution {
+    protected readonly sessions = new Map<string, DebugAdapterSession>();
+
+    @inject(DebugAdapterSessionFactory)
+    protected readonly debugAdapterSessionFactory: DebugAdapterSessionFactory;
+
+    @inject(DebugAdapterFactory)
+    protected readonly debugAdapterFactory: DebugAdapterFactory;
+
+    configure(service: MessagingService): void {
+        service.registerChannelHandler(`${DebugAdapterPath}/:id`, ({ id }: { id: string }, wsChannel) => {
+            const session = this.find(id);
+            if (!session) {
+                wsChannel.close();
+                return;
+            }
+            session.start(new ForwardingDebugChannel(wsChannel));
+        });
+    }
+
+    /**
+     * Creates a new [debug adapter session](#DebugAdapterSession).
+     * @param config The [DebugConfiguration](#DebugConfiguration)
+     * @returns The debug adapter session
+     */
+    async create(config: DebugConfiguration, registry: DebugAdapterContributionRegistry): Promise<DebugAdapterSession> {
+        const sessionId = UUID.uuid4();
+
+        let communicationProvider;
+        if ('debugServer' in config) {
+            communicationProvider = this.debugAdapterFactory.connect(config.debugServer);
+        } else {
+            const executable = await registry.provideDebugAdapterExecutable(config);
+            communicationProvider = this.debugAdapterFactory.start(executable);
+        }
+
+        const sessionFactory = registry.debugAdapterSessionFactory(config.type) || this.debugAdapterSessionFactory;
+        const session = sessionFactory.get(sessionId, communicationProvider);
+        this.sessions.set(sessionId, session);
+
+        if (config.parentSession) {
+            const parentSession = this.sessions.get(config.parentSession.id);
+            if (parentSession) {
+                session.parentSession = parentSession;
+            }
+        }
+
+        return session;
+    }
+
+    /**
+     * Removes [debug adapter session](#DebugAdapterSession) from the list of the instantiated sessions.
+     * Is invoked when session is terminated and isn't needed anymore.
+     * @param sessionId The session identifier
+     */
+    remove(sessionId: string): void {
+        this.sessions.delete(sessionId);
+    }
+
+    /**
+     * Finds the debug adapter session by its id.
+     * Returning the value 'undefined' means the session isn't found.
+     * @param sessionId The session identifier
+     * @returns The debug adapter session
+     */
+    find(sessionId: string): DebugAdapterSession | undefined {
+        return this.sessions.get(sessionId);
+    }
+
+    /**
+     * Returns all instantiated debug adapter sessions.
+     * @returns An array of debug adapter sessions
+     */
+    getAll(): IterableIterator<DebugAdapterSession> {
+        return this.sessions.values();
+    }
+}

package/src/node/debug-backend-module.ts

@@ -1,57 +1,57 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { bindContributionProvider, ILogger } from '@theia/core/lib/common';
-import { ContainerModule } from '@theia/core/shared/inversify';
-import {
-    DebugPath,
-    DebugService
-} from '../common/debug-service';
-import {
-    LaunchBasedDebugAdapterFactory,
-    DebugAdapterSessionFactoryImpl
-} from './debug-adapter-factory';
-import { MessagingService } from '@theia/core/lib/node/messaging/messaging-service';
-import { ConnectionContainerModule } from '@theia/core/lib/node/messaging/connection-container-module';
-import {
-    DebugAdapterContribution,
-    DebugAdapterSessionFactory,
-    DebugAdapterFactory
-} from '../common/debug-model';
-import { DebugServiceImpl } from './debug-service-impl';
-import { DebugAdapterContributionRegistry } from '../common/debug-adapter-contribution-registry';
-import { DebugAdapterSessionManager } from './debug-adapter-session-manager';
-
-const debugConnectionModule = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
-    bindContributionProvider(bind, DebugAdapterContribution);
-    bind(DebugAdapterContributionRegistry).toSelf().inSingletonScope();
-
-    bind(DebugService).to(DebugServiceImpl).inSingletonScope();
-    bindBackendService(DebugPath, DebugService);
-});
-
-export default new ContainerModule(bind => {
-    bind(ConnectionContainerModule).toConstantValue(debugConnectionModule);
-
-    bind(DebugAdapterSessionFactory).to(DebugAdapterSessionFactoryImpl).inSingletonScope();
-    bind(DebugAdapterFactory).to(LaunchBasedDebugAdapterFactory).inSingletonScope();
-    bind(DebugAdapterSessionManager).toSelf().inSingletonScope();
-    bind(MessagingService.Contribution).toService(DebugAdapterSessionManager);
-
-    bind(ILogger).toDynamicValue(({ container }) =>
-        container.get<ILogger>(ILogger).child('debug')
-    ).inSingletonScope().whenTargetNamed('debug');
-});
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { bindContributionProvider, ILogger } from '@theia/core/lib/common';
+import { ContainerModule } from '@theia/core/shared/inversify';
+import {
+    DebugPath,
+    DebugService
+} from '../common/debug-service';
+import {
+    LaunchBasedDebugAdapterFactory,
+    DebugAdapterSessionFactoryImpl
+} from './debug-adapter-factory';
+import { MessagingService } from '@theia/core/lib/node/messaging/messaging-service';
+import { ConnectionContainerModule } from '@theia/core/lib/node/messaging/connection-container-module';
+import {
+    DebugAdapterContribution,
+    DebugAdapterSessionFactory,
+    DebugAdapterFactory
+} from '../common/debug-model';
+import { DebugServiceImpl } from './debug-service-impl';
+import { DebugAdapterContributionRegistry } from '../common/debug-adapter-contribution-registry';
+import { DebugAdapterSessionManager } from './debug-adapter-session-manager';
+
+const debugConnectionModule = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
+    bindContributionProvider(bind, DebugAdapterContribution);
+    bind(DebugAdapterContributionRegistry).toSelf().inSingletonScope();
+
+    bind(DebugService).to(DebugServiceImpl).inSingletonScope();
+    bindBackendService(DebugPath, DebugService);
+});
+
+export default new ContainerModule(bind => {
+    bind(ConnectionContainerModule).toConstantValue(debugConnectionModule);
+
+    bind(DebugAdapterSessionFactory).to(DebugAdapterSessionFactoryImpl).inSingletonScope();
+    bind(DebugAdapterFactory).to(LaunchBasedDebugAdapterFactory).inSingletonScope();
+    bind(DebugAdapterSessionManager).toSelf().inSingletonScope();
+    bind(MessagingService.Contribution).toService(DebugAdapterSessionManager);
+
+    bind(ILogger).toDynamicValue(({ container }) =>
+        container.get<ILogger>(ILogger).child('debug')
+    ).inSingletonScope().whenTargetNamed('debug');
+});