@theia/plugin-ext 1.53.0-next.4 → 1.53.0-next.55

package/src/main/browser/debug/plugin-debug-session-contribution-registry.ts

@@ -1,76 +1,76 @@
-// *****************************************************************************
-// 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 { DebugSessionContributionRegistry, DebugSessionContribution } from '@theia/debug/lib/browser/debug-session-contribution';
-import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify';
-import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
-import { Disposable } from '@theia/core/lib/common/disposable';
-
-/**
- * Debug session contribution registrator.
- */
-export interface PluginDebugSessionContributionRegistrator {
-    /**
-     * Registers [DebugSessionContribution](#DebugSessionContribution).
-     * @param contrib contribution
-     */
-    registerDebugSessionContribution(contrib: DebugSessionContribution): Disposable;
-
-    /**
-     * Unregisters [DebugSessionContribution](#DebugSessionContribution).
-     * @param debugType the debug type
-     */
-    unregisterDebugSessionContribution(debugType: string): void;
-}
-
-/**
- * Plugin debug session contribution registry implementation with functionality
- * to register / unregister plugin contributions.
- */
-@injectable()
-export class PluginDebugSessionContributionRegistry implements DebugSessionContributionRegistry, PluginDebugSessionContributionRegistrator {
-    protected readonly contribs = new Map<string, DebugSessionContribution>();
-
-    @inject(ContributionProvider) @named(DebugSessionContribution)
-    protected readonly contributions: ContributionProvider<DebugSessionContribution>;
-
-    @postConstruct()
-    protected init(): void {
-        for (const contrib of this.contributions.getContributions()) {
-            this.contribs.set(contrib.debugType, contrib);
-        }
-    }
-
-    get(debugType: string): DebugSessionContribution | undefined {
-        return this.contribs.get(debugType);
-    }
-
-    registerDebugSessionContribution(contrib: DebugSessionContribution): Disposable {
-        const { debugType } = contrib;
-
-        if (this.contribs.has(debugType)) {
-            console.warn(`Debug session contribution already registered for ${debugType}`);
-            return Disposable.NULL;
-        }
-
-        this.contribs.set(debugType, contrib);
-        return Disposable.create(() => this.unregisterDebugSessionContribution(debugType));
-    }
-
-    unregisterDebugSessionContribution(debugType: string): void {
-        this.contribs.delete(debugType);
-    }
-}
+// *****************************************************************************
+// 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 { DebugSessionContributionRegistry, DebugSessionContribution } from '@theia/debug/lib/browser/debug-session-contribution';
+import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify';
+import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
+import { Disposable } from '@theia/core/lib/common/disposable';
+
+/**
+ * Debug session contribution registrator.
+ */
+export interface PluginDebugSessionContributionRegistrator {
+    /**
+     * Registers [DebugSessionContribution](#DebugSessionContribution).
+     * @param contrib contribution
+     */
+    registerDebugSessionContribution(contrib: DebugSessionContribution): Disposable;
+
+    /**
+     * Unregisters [DebugSessionContribution](#DebugSessionContribution).
+     * @param debugType the debug type
+     */
+    unregisterDebugSessionContribution(debugType: string): void;
+}
+
+/**
+ * Plugin debug session contribution registry implementation with functionality
+ * to register / unregister plugin contributions.
+ */
+@injectable()
+export class PluginDebugSessionContributionRegistry implements DebugSessionContributionRegistry, PluginDebugSessionContributionRegistrator {
+    protected readonly contribs = new Map<string, DebugSessionContribution>();
+
+    @inject(ContributionProvider) @named(DebugSessionContribution)
+    protected readonly contributions: ContributionProvider<DebugSessionContribution>;
+
+    @postConstruct()
+    protected init(): void {
+        for (const contrib of this.contributions.getContributions()) {
+            this.contribs.set(contrib.debugType, contrib);
+        }
+    }
+
+    get(debugType: string): DebugSessionContribution | undefined {
+        return this.contribs.get(debugType);
+    }
+
+    registerDebugSessionContribution(contrib: DebugSessionContribution): Disposable {
+        const { debugType } = contrib;
+
+        if (this.contribs.has(debugType)) {
+            console.warn(`Debug session contribution already registered for ${debugType}`);
+            return Disposable.NULL;
+        }
+
+        this.contribs.set(debugType, contrib);
+        return Disposable.create(() => this.unregisterDebugSessionContribution(debugType));
+    }
+
+    unregisterDebugSessionContribution(debugType: string): void {
+        this.contribs.delete(debugType);
+    }
+}

package/src/main/browser/debug/plugin-debug-session-factory.ts

@@ -1,115 +1,115 @@
-// *****************************************************************************
-// 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 { DefaultDebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution';
-import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
-import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
-import { BreakpointManager } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager';
-import { LabelProvider } from '@theia/core/lib/browser/label-provider';
-import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
-import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
-import { DebugPreferences } from '@theia/debug/lib/browser/debug-preferences';
-import { DebugConfigurationSessionOptions, TestRunReference } from '@theia/debug/lib/browser/debug-session-options';
-import { DebugSession } from '@theia/debug/lib/browser/debug-session';
-import { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';
-import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
-import { TerminalOptionsExt } from '../../../common/plugin-api-rpc';
-import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
-import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
-import { WorkspaceService } from '@theia/workspace/lib/browser';
-import { PluginChannel } from '../../../common/connection';
-import { TestService } from '@theia/test/lib/browser/test-service';
-import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
-
-export class PluginDebugSession extends DebugSession {
-    constructor(
-        override readonly id: string,
-        override readonly options: DebugConfigurationSessionOptions,
-        override readonly parentSession: DebugSession | undefined,
-        testService: TestService,
-        testRun: TestRunReference | undefined,
-        sessionManager: DebugSessionManager,
-        protected override readonly connection: DebugSessionConnection,
-        protected override readonly terminalServer: TerminalService,
-        protected override readonly editorManager: EditorManager,
-        protected override readonly breakpoints: BreakpointManager,
-        protected override readonly labelProvider: LabelProvider,
-        protected override readonly messages: MessageClient,
-        protected override readonly fileService: FileService,
-        protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
-        protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>,
-        protected override readonly workspaceService: WorkspaceService) {
-        super(id, options, parentSession, testService, testRun, sessionManager, connection, terminalServer, editorManager, breakpoints,
-            labelProvider, messages, fileService, debugContributionProvider,
-            workspaceService);
-    }
-
-    protected override async doCreateTerminal(terminalWidgetOptions: TerminalWidgetOptions): Promise<TerminalWidget> {
-        terminalWidgetOptions = Object.assign({}, terminalWidgetOptions, this.terminalOptionsExt);
-        return super.doCreateTerminal(terminalWidgetOptions);
-    }
-}
-
-/**
- * Session factory for a client debug session that communicates with debug adapter contributed as plugin.
- * The main difference is to use a connection factory that creates [Channel](#Channel) over Rpc channel.
- */
-export class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
-    constructor(
-        protected override readonly terminalService: TerminalService,
-        protected override readonly editorManager: EditorManager,
-        protected override readonly breakpoints: BreakpointManager,
-        protected override readonly labelProvider: LabelProvider,
-        protected override readonly messages: MessageClient,
-        protected override readonly outputChannelManager: OutputChannelManager,
-        protected override readonly debugPreferences: DebugPreferences,
-        protected readonly connectionFactory: (sessionId: string) => Promise<PluginChannel>,
-        protected override readonly fileService: FileService,
-        protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
-        protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>,
-        protected override readonly testService: TestService,
-        protected override readonly workspaceService: WorkspaceService,
-    ) {
-        super();
-    }
-
-    override get(manager: DebugSessionManager, sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
-        const connection = new DebugSessionConnection(
-            sessionId,
-            this.connectionFactory,
-            this.getTraceOutputChannel());
-
-        return new PluginDebugSession(
-            sessionId,
-            options,
-            parentSession,
-            this.testService,
-            options.testRun,
-            manager,
-            connection,
-            this.terminalService,
-            this.editorManager,
-            this.breakpoints,
-            this.labelProvider,
-            this.messages,
-            this.fileService,
-            this.terminalOptionsExt,
-            this.debugContributionProvider,
-            this.workspaceService,
-        );
-    }
-}
+// *****************************************************************************
+// 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 { DefaultDebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution';
+import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
+import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
+import { BreakpointManager } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager';
+import { LabelProvider } from '@theia/core/lib/browser/label-provider';
+import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
+import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
+import { DebugPreferences } from '@theia/debug/lib/browser/debug-preferences';
+import { DebugConfigurationSessionOptions, TestRunReference } from '@theia/debug/lib/browser/debug-session-options';
+import { DebugSession } from '@theia/debug/lib/browser/debug-session';
+import { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';
+import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
+import { TerminalOptionsExt } from '../../../common/plugin-api-rpc';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
+import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
+import { PluginChannel } from '../../../common/connection';
+import { TestService } from '@theia/test/lib/browser/test-service';
+import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
+
+export class PluginDebugSession extends DebugSession {
+    constructor(
+        override readonly id: string,
+        override readonly options: DebugConfigurationSessionOptions,
+        override readonly parentSession: DebugSession | undefined,
+        testService: TestService,
+        testRun: TestRunReference | undefined,
+        sessionManager: DebugSessionManager,
+        protected override readonly connection: DebugSessionConnection,
+        protected override readonly terminalServer: TerminalService,
+        protected override readonly editorManager: EditorManager,
+        protected override readonly breakpoints: BreakpointManager,
+        protected override readonly labelProvider: LabelProvider,
+        protected override readonly messages: MessageClient,
+        protected override readonly fileService: FileService,
+        protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
+        protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>,
+        protected override readonly workspaceService: WorkspaceService) {
+        super(id, options, parentSession, testService, testRun, sessionManager, connection, terminalServer, editorManager, breakpoints,
+            labelProvider, messages, fileService, debugContributionProvider,
+            workspaceService);
+    }
+
+    protected override async doCreateTerminal(terminalWidgetOptions: TerminalWidgetOptions): Promise<TerminalWidget> {
+        terminalWidgetOptions = Object.assign({}, terminalWidgetOptions, this.terminalOptionsExt);
+        return super.doCreateTerminal(terminalWidgetOptions);
+    }
+}
+
+/**
+ * Session factory for a client debug session that communicates with debug adapter contributed as plugin.
+ * The main difference is to use a connection factory that creates [Channel](#Channel) over Rpc channel.
+ */
+export class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
+    constructor(
+        protected override readonly terminalService: TerminalService,
+        protected override readonly editorManager: EditorManager,
+        protected override readonly breakpoints: BreakpointManager,
+        protected override readonly labelProvider: LabelProvider,
+        protected override readonly messages: MessageClient,
+        protected override readonly outputChannelManager: OutputChannelManager,
+        protected override readonly debugPreferences: DebugPreferences,
+        protected readonly connectionFactory: (sessionId: string) => Promise<PluginChannel>,
+        protected override readonly fileService: FileService,
+        protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
+        protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>,
+        protected override readonly testService: TestService,
+        protected override readonly workspaceService: WorkspaceService,
+    ) {
+        super();
+    }
+
+    override get(manager: DebugSessionManager, sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
+        const connection = new DebugSessionConnection(
+            sessionId,
+            this.connectionFactory,
+            this.getTraceOutputChannel());
+
+        return new PluginDebugSession(
+            sessionId,
+            options,
+            parentSession,
+            this.testService,
+            options.testRun,
+            manager,
+            connection,
+            this.terminalService,
+            this.editorManager,
+            this.breakpoints,
+            this.labelProvider,
+            this.messages,
+            this.fileService,
+            this.terminalOptionsExt,
+            this.debugContributionProvider,
+            this.workspaceService,
+        );
+    }
+}