@theia/debug 1.73.0-next.20 → 1.73.0-next.26

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@theia/debug",
-  "version": "1.73.0-next.20+f7f30c799",
+  "version": "1.73.0-next.26+d6f45631a",
   "description": "Theia - Debug Extension",
   "dependencies": {
-    "@theia/console": "1.73.0-next.20+f7f30c799",
-    "@theia/core": "1.73.0-next.20+f7f30c799",
-    "@theia/editor": "1.73.0-next.20+f7f30c799",
-    "@theia/filesystem": "1.73.0-next.20+f7f30c799",
-    "@theia/markers": "1.73.0-next.20+f7f30c799",
-    "@theia/monaco": "1.73.0-next.20+f7f30c799",
+    "@theia/console": "1.73.0-next.26+d6f45631a",
+    "@theia/core": "1.73.0-next.26+d6f45631a",
+    "@theia/editor": "1.73.0-next.26+d6f45631a",
+    "@theia/filesystem": "1.73.0-next.26+d6f45631a",
+    "@theia/markers": "1.73.0-next.26+d6f45631a",
+    "@theia/monaco": "1.73.0-next.26+d6f45631a",
     "@theia/monaco-editor-core": "1.108.201",
-    "@theia/output": "1.73.0-next.20+f7f30c799",
-    "@theia/process": "1.73.0-next.20+f7f30c799",
-    "@theia/task": "1.73.0-next.20+f7f30c799",
-    "@theia/terminal": "1.73.0-next.20+f7f30c799",
-    "@theia/test": "1.73.0-next.20+f7f30c799",
-    "@theia/variable-resolver": "1.73.0-next.20+f7f30c799",
-    "@theia/workspace": "1.73.0-next.20+f7f30c799",
+    "@theia/output": "1.73.0-next.26+d6f45631a",
+    "@theia/process": "1.73.0-next.26+d6f45631a",
+    "@theia/task": "1.73.0-next.26+d6f45631a",
+    "@theia/terminal": "1.73.0-next.26+d6f45631a",
+    "@theia/test": "1.73.0-next.26+d6f45631a",
+    "@theia/variable-resolver": "1.73.0-next.26+d6f45631a",
+    "@theia/workspace": "1.73.0-next.26+d6f45631a",
     "@vscode/debugprotocol": "^1.68.0",
     "fast-deep-equal": "^3.1.3",
     "jsonc-parser": "^3.3.1",
@@ -64,5 +64,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "f7f30c799bad3eeeb4daa01583a7083a9d58c26d"
+  "gitHead": "d6f45631a893ad1944a87db5aaf4bc94c64b1c60"
 }

package/src/browser/console/debug-console-session.ts

@@ -22,11 +22,11 @@ import { DebugSession } from '../debug-session';
 import URI from '@theia/core/lib/common/uri';
 import { ExpressionContainer, ExpressionItem } from './debug-console-items';
 import { Severity } from '@theia/core/lib/common/severity';
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
 import { DebugSessionManager } from '../debug-session-manager';
 import * as monaco from '@theia/monaco-editor-core';
 import { LanguageSelector } from '@theia/monaco-editor-core/esm/vs/editor/common/languageSelector';
-import { Disposable } from '@theia/core';
+import { Disposable, ILogger } from '@theia/core';
 
 export const DebugConsoleSessionFactory = Symbol('DebugConsoleSessionFactory');
 
@@ -39,6 +39,9 @@ export class DebugConsoleSession extends ConsoleSession {
 
     @inject(DebugSessionManager) protected readonly sessionManager: DebugSessionManager;
 
+    @inject(ILogger) @named('debug:DebugConsoleSession')
+    protected readonly logger: ILogger;
+
     protected items: ConsoleItem[] = [];
 
     protected _terminated = false;
@@ -248,7 +251,7 @@ export class DebugConsoleSession extends ConsoleSession {
         const body = event.body;
         const { category, variablesReference } = body;
         if (category === 'telemetry') {
-            console.debug(`telemetry/${event.body.output}`, event.body.data);
+            this.logger.debug(`telemetry/${event.body.output}`, event.body.data);
             return;
         }
         const severity = category === 'stderr' ? Severity.Error : event.body.category === 'console' ? Severity.Warning : Severity.Info;

package/src/browser/debug-frontend-application-contribution.ts

@@ -18,7 +18,7 @@ import {
     AbstractViewContribution, KeybindingRegistry, Widget, CompositeTreeNode, LabelProvider, codicon, OnWillStopAction, FrontendApplicationContribution, ConfirmDialog, Dialog
 } from '@theia/core/lib/browser';
 import { TreeElementNode } from '@theia/core/lib/browser/source-tree';
-import { injectable, inject } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
 import * as monaco from '@theia/monaco-editor-core';
 import { MenuModelRegistry, CommandRegistry, Command, URI, Event, MessageService, CancellationError } from '@theia/core/lib/common';
 import { waitForEvent } from '@theia/core/lib/common/promise-util';
@@ -68,6 +68,7 @@ import {
     DebugMenus, DebugCommands, DebugThreadContextCommands, DebugSessionContextCommands,
     DebugEditorContextCommands, DebugBreakpointWidgetCommands, nlsEnableBreakpoint, nlsDisableBreakpoint
 } from './debug-commands';
+import { ILogger } from '@theia/core';
 
 @injectable()
 export class DebugFrontendApplicationContribution extends AbstractViewContribution<DebugWidget>
@@ -115,6 +116,9 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
     @inject(AddOrEditDataBreakpointAddress)
     protected readonly AddOrEditDataBreakpointAddress: AddOrEditDataBreakpointAddress;
 
+    @inject(ILogger) @named('debug:DebugFrontendApplicationContribution')
+    protected readonly logger: ILogger;
+
     constructor() {
         super({
             widgetId: DebugWidget.ID,
@@ -1046,7 +1050,7 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
             if (thread.stopped && thread === this.manager.currentThread) {
                 return true;
             }
-            console.warn('Cannot run to the specified location. The current thread has changed or is not stopped.');
+            this.logger.warn('Cannot run to the specified location. The current thread has changed or is not stopped.');
             return false;
         };
         if (!checkThread()) {

package/src/browser/debug-frontend-module.ts

@@ -77,7 +77,7 @@ export default new ContainerModule((bind: interfaces.Bind) => {
     ).inSingletonScope();
 
     bindRootContributionProvider(bind, DebugSessionContribution);
-    bind(DebugSessionFactory).to(DefaultDebugSessionFactory).inSingletonScope();
+    bind(DebugSessionFactory).toDynamicValue(ctx => new DefaultDebugSessionFactory(ctx.container)).inSingletonScope();
     bind(DebugSessionManager).toSelf().inSingletonScope();
 
     bind(BreakpointManager).toSelf().inSingletonScope();

package/src/browser/debug-session-contribution.ts

@@ -14,25 +14,15 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify';
-import { CommandService, MessageClient } from '@theia/core/lib/common';
-import { LabelProvider } from '@theia/core/lib/browser';
-import { EditorManager } from '@theia/editor/lib/browser';
-import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
-import { DebugSession } from './debug-session';
-import { BreakpointManager } from './breakpoint/breakpoint-manager';
+import { injectable, inject, named, postConstruct, interfaces } from '@theia/core/shared/inversify';
+import { DebugSession, DebugSessionData } from './debug-session';
 import { DebugConfigurationSessionOptions, DebugSessionOptions } from './debug-session-options';
 import { OutputChannelManager, OutputChannel } from '@theia/output/lib/browser/output-channel';
 import { DebugPreferences } from '../common/debug-preferences';
 import { DebugSessionConnection } from './debug-session-connection';
 import { DebugChannel, DebugAdapterPath, ForwardingDebugChannel } from '../common/debug-service';
 import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
-import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { DebugContribution } from './debug-contribution';
-import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { RemoteConnectionProvider, ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider';
-import { TestService } from '@theia/test/lib/browser/test-service';
-import { DebugSessionManager } from './debug-session-manager';
 
 /**
  * DebugSessionContribution symbol for DI.
@@ -92,71 +82,40 @@ export const DebugSessionFactory = Symbol('DebugSessionFactory');
  * The [debug session](#DebugSession) factory.
  */
 export interface DebugSessionFactory {
-    get(manager: DebugSessionManager, sessionId: string, options: DebugSessionOptions, parentSession?: DebugSession): DebugSession;
+    createSession(sessionId: string, options: DebugSessionOptions, parentSession?: DebugSession): DebugSession;
 }
 
-@injectable()
 export class DefaultDebugSessionFactory implements DebugSessionFactory {
-    @inject(RemoteConnectionProvider)
-    protected readonly connectionProvider: ServiceConnectionProvider;
-    @inject(TerminalService)
-    protected readonly terminalService: TerminalService;
-    @inject(EditorManager)
-    protected readonly editorManager: EditorManager;
-    @inject(BreakpointManager)
-    protected readonly breakpoints: BreakpointManager;
-    @inject(LabelProvider)
-    protected readonly labelProvider: LabelProvider;
-    @inject(MessageClient)
-    protected readonly messages: MessageClient;
-    @inject(OutputChannelManager)
-    protected readonly outputChannelManager: OutputChannelManager;
-    @inject(DebugPreferences)
-    protected readonly debugPreferences: DebugPreferences;
-    @inject(FileService)
-    protected readonly fileService: FileService;
-    @inject(ContributionProvider) @named(DebugContribution)
-    protected readonly debugContributionProvider: ContributionProvider<DebugContribution>;
-    @inject(TestService)
-    protected readonly testService: TestService;
-    @inject(WorkspaceService)
-    protected readonly workspaceService: WorkspaceService;
-    @inject(CommandService)
-    protected commandService: CommandService;
+    protected readonly container: interfaces.Container;
+
+    constructor(container: interfaces.Container) {
+        this.container = container;
+    }
 
-    get(manager: DebugSessionManager, sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
+    createSession(sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
+        const connectionProvider: ServiceConnectionProvider = this.container.get(RemoteConnectionProvider);
         const connection = new DebugSessionConnection(
             sessionId,
             () => new Promise<DebugChannel>(resolve =>
-                this.connectionProvider.listen(`${DebugAdapterPath}/${sessionId}`, (_, wsChannel) => {
+                connectionProvider.listen(`${DebugAdapterPath}/${sessionId}`, (_, wsChannel) => {
                     resolve(new ForwardingDebugChannel(wsChannel));
                 }, false)
             ),
             this.getTraceOutputChannel());
-        return new DebugSession(
-            sessionId,
+        const data: DebugSessionData = {
+            id: sessionId,
             options,
             parentSession,
-            this.testService,
-            options.testRun,
-            manager,
-            connection,
-            this.terminalService,
-            this.editorManager,
-            this.breakpoints,
-            this.labelProvider,
-            this.messages,
-            this.fileService,
-            this.debugContributionProvider,
-            this.workspaceService,
-            this.debugPreferences,
-            this.commandService
-        );
+        };
+        const child = DebugSession.createContainer(this.container, data, connection);
+        return child.get(DebugSession);
     }
 
     protected getTraceOutputChannel(): OutputChannel | undefined {
-        if (this.debugPreferences['debug.trace']) {
-            return this.outputChannelManager.getChannel('Debug adapters');
+        const outputChannelManager: OutputChannelManager = this.container.get(OutputChannelManager);
+        const debugPreferences: DebugPreferences = this.container.get(DebugPreferences);
+        if (debugPreferences['debug.trace']) {
+            return outputChannelManager.getChannel('Debug adapters');
         }
     }
 }

package/src/browser/debug-session-manager.ts

@@ -14,12 +14,12 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { DisposableCollection, Emitter, Event, MessageService, nls, ProgressService, WaitUntilEvent } from '@theia/core';
+import { DisposableCollection, Emitter, Event, MessageService, nls, ProgressService, WaitUntilEvent, ILogger } from '@theia/core';
 import { ApplicationShell, ConfirmDialog } from '@theia/core/lib/browser';
 import { ContextKey, ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
 import URI from '@theia/core/lib/common/uri';
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
 import * as monaco from '@theia/monaco-editor-core';
 import { QuickOpenTask } from '@theia/task/lib/browser/quick-open-task';
 import { TaskEndedInfo, TaskEndedTypes, TaskService } from '@theia/task/lib/browser/task-service';
@@ -152,6 +152,9 @@ export class DebugSessionManager {
     @inject(DebugSessionConfigurationLabelProvider)
     protected readonly sessionConfigurationLabelProvider: DebugSessionConfigurationLabelProvider;
 
+    @inject(ILogger) @named('debug:DebugSessionManager')
+    protected readonly logger: ILogger;
+
     @inject(WorkspaceTrustService)
     protected readonly workspaceTrustService: WorkspaceTrustService;
 
@@ -188,7 +191,7 @@ export class DebugSessionManager {
             await this.shell.saveAll();
             return true;
         } catch (error) {
-            console.error('saveAll failed:', error);
+            this.logger.error('saveAll failed:', error);
             return false;
         }
     }
@@ -265,7 +268,7 @@ export class DebugSessionManager {
                 }
 
                 this.messageService.error(nls.localize('theia/debug/errorStartingDebugSession', 'There was an error starting the debug session, check the logs for more details.'));
-                console.error('Error starting the debug session', e);
+                this.logger.error('Error starting the debug session', e);
                 throw e;
             }
         });
@@ -412,7 +415,7 @@ export class DebugSessionManager {
         const parentSession = options.configuration.parentSessionId ? this._sessions.get(options.configuration.parentSessionId) : undefined;
         const contrib = this.sessionContributionRegistry.get(options.configuration.type);
         const sessionFactory = contrib ? contrib.debugSessionFactory() : this.debugSessionFactory;
-        const session = sessionFactory.get(this, sessionId, options, parentSession);
+        const session = sessionFactory.createSession(sessionId, options, parentSession);
         this._sessions.set(sessionId, session);
 
         this.debugTypeKey.set(session.configuration.type);

package/src/browser/debug-session.tsx

@@ -31,6 +31,7 @@ import {
     CommandService,
     CancellationError
 } from '@theia/core/lib/common';
+import { inject, injectable, named, postConstruct, interfaces, LazyServiceIdentifier } from '@theia/core/shared/inversify';
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
 import { EditorManager } from '@theia/editor/lib/browser';
 import { CompositeTreeElement } from '@theia/core/lib/browser/source-tree';
@@ -43,7 +44,7 @@ import { DebugBreakpoint } from './model/debug-breakpoint';
 import debounce = require('p-debounce');
 import URI from '@theia/core/lib/common/uri';
 import { BreakpointManager } from './breakpoint/breakpoint-manager';
-import { DebugConfigurationSessionOptions, InternalDebugSessionOptions, TestRunReference } from './debug-session-options';
+import { DebugConfigurationSessionOptions, InternalDebugSessionOptions } from './debug-session-options';
 import { DebugConfiguration, DebugConsoleMode } from '../common/debug-common';
 import { SourceBreakpoint } from './breakpoint/breakpoint-marker';
 import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
@@ -57,6 +58,14 @@ import { DebugSessionManager } from './debug-session-manager';
 
 import { DebugPreferences } from '../common/debug-preferences';
 
+export const DebugSessionData = Symbol('DebugSessionData');
+export const DebugSessionStopTimeout = Symbol('DebugSessionStopTimeout');
+export interface DebugSessionData {
+    id: string;
+    options: DebugConfigurationSessionOptions;
+    parentSession: DebugSession | undefined;
+}
+
 export enum DebugState {
     Inactive,
     Initializing,
@@ -87,8 +96,79 @@ export function formatMessage(format: string, variables?: { [key: string]: strin
     return variables ? format.replace(formatMessageRegexp, (match, group) => variables.hasOwnProperty(group) ? variables[group] : match) : format;
 }
 
-// FIXME: make injectable to allow easily inject services
+@injectable()
 export class DebugSession implements CompositeTreeElement {
+
+    static createContainer(parent: interfaces.Container, data: DebugSessionData, connection: DebugSessionConnection): interfaces.Container {
+        const child = parent.createChild();
+        child.bind(DebugSessionData).toConstantValue(data);
+        child.bind(DebugSessionStopTimeout).toConstantValue(5_000);
+        child.bind(DebugSessionConnection).toConstantValue(connection);
+        child.bind(DebugSession).toSelf().inSingletonScope();
+        return child;
+    }
+
+    @inject(DebugSessionData)
+    protected readonly data: DebugSessionData;
+
+    @inject(DebugSessionConnection)
+    protected readonly connection: DebugSessionConnection;
+
+    @inject(TestService)
+    protected readonly testService: TestService;
+
+    @inject(new LazyServiceIdentifier(() => DebugSessionManager))
+    protected readonly sessionManager: DebugSessionManager;
+
+    @inject(TerminalService)
+    protected readonly terminalServer: TerminalService;
+
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    @inject(BreakpointManager)
+    protected readonly breakpoints: BreakpointManager;
+
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
+
+    @inject(MessageClient)
+    protected readonly messages: MessageClient;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(ContributionProvider)
+    @named(DebugContribution)
+    protected readonly debugContributionProvider: ContributionProvider<DebugContribution>;
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    @inject(DebugPreferences)
+    protected readonly debugPreferences: DebugPreferences;
+
+    @inject(CommandService)
+    protected readonly commandService: CommandService;
+
+    /**
+     * Number of millis after a `stop` request times out. It's 5 seconds by default.
+     */
+    @inject(DebugSessionStopTimeout)
+    protected readonly stopTimeout: number;
+
+    get id(): string {
+        return this.data.id;
+    }
+
+    get options(): DebugConfigurationSessionOptions {
+        return this.data.options;
+    }
+
+    get parentSession(): DebugSession | undefined {
+        return this.data.parentSession;
+    }
+
     protected readonly deferredOnDidConfigureCapabilities = new Deferred<void>();
 
     protected readonly onDidChangeEmitter = new Emitter<void>();
@@ -117,47 +197,26 @@ export class DebugSession implements CompositeTreeElement {
     /** Maximum time to wait for the shell integration prompt before proceeding. */
     protected readonly PROMPT_READY_TIMEOUT_MS = 3000;
 
-    constructor(
-        readonly id: string,
-        readonly options: DebugConfigurationSessionOptions,
-        readonly parentSession: DebugSession | undefined,
-        testService: TestService,
-        testRun: TestRunReference | undefined,
-        sessionManager: DebugSessionManager,
-        protected readonly connection: DebugSessionConnection,
-        protected readonly terminalServer: TerminalService,
-        protected readonly editorManager: EditorManager,
-        protected readonly breakpoints: BreakpointManager,
-        protected readonly labelProvider: LabelProvider,
-        protected readonly messages: MessageClient,
-        protected readonly fileService: FileService,
-        protected readonly debugContributionProvider: ContributionProvider<DebugContribution>,
-        protected readonly workspaceService: WorkspaceService,
-        protected readonly debugPreferences: DebugPreferences,
-        protected readonly commandService: CommandService,
-        /**
-         * Number of millis after a `stop` request times out. It's 5 seconds by default.
-         */
-        protected readonly stopTimeout = 5_000,
-    ) {
+    @postConstruct()
+    protected init(): void {
         this.connection.onRequest('runInTerminal', (request: DebugProtocol.RunInTerminalRequest) => this.runInTerminal(request));
         this.connection.onDidClose(() => {
             this.toDispose.dispose();
         });
-        this.registerDebugContributions(options.configuration.type, this.connection);
+        this.registerDebugContributions(this.options.configuration.type, this.connection);
 
-        if (parentSession) {
-            parentSession.childSessions.set(id, this);
+        if (this.parentSession) {
+            this.parentSession.childSessions.set(this.id, this);
             this.toDispose.push(Disposable.create(() => {
-                this.parentSession?.childSessions?.delete(id);
+                this.parentSession?.childSessions?.delete(this.id);
             }));
         }
-        if (testRun) {
+        if (this.options.testRun) {
             try {
-                const run = TestServices.withTestRun(testService, testRun.controllerId, testRun.runId);
+                const run = TestServices.withTestRun(this.testService, this.options.testRun.controllerId, this.options.testRun.runId);
                 run.onDidChangeProperty(evt => {
                     if (evt.isRunning === false) {
-                        sessionManager.terminateSession(this);
+                        this.sessionManager.terminateSession(this);
                     }
                 });
             } catch (err) {

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

@@ -15,8 +15,8 @@
 // *****************************************************************************
 
 import * as React from '@theia/core/shared/react';
-import { inject, postConstruct, injectable } from '@theia/core/shared/inversify';
-import { CommandMenu, CompoundMenuNode, MenuModelRegistry, MenuPath } from '@theia/core';
+import { inject, postConstruct, injectable, named } from '@theia/core/shared/inversify';
+import { CommandMenu, CompoundMenuNode, MenuModelRegistry, MenuPath, ILogger } from '@theia/core';
 import { KeybindingRegistry } from '@theia/core/lib/browser';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { ReactWidget } from '@theia/core/lib/browser/widgets';
@@ -33,6 +33,8 @@ export class DebugToolBar extends ReactWidget {
     @inject(KeybindingRegistry) protected readonly keybindingRegistry: KeybindingRegistry;
     @inject(ContextKeyService) protected readonly contextKeyService: ContextKeyService;
     @inject(DebugViewModel) protected readonly model: DebugViewModel;
+    @inject(ILogger) @named('debug:DebugToolBar')
+    protected readonly logger: ILogger;
 
     @postConstruct()
     protected init(): void {
@@ -69,7 +71,7 @@ export class DebugToolBar extends ReactWidget {
 
     protected debugAction(commandMenuNode: CommandMenu): React.ReactNode {
         const accelerator = this.acceleratorFor(commandMenuNode.id);
-        const run = (effectiveMenuPath: MenuPath) => commandMenuNode.run(effectiveMenuPath).catch(e => console.error(e));
+        const run = (effectiveMenuPath: MenuPath) => commandMenuNode.run(effectiveMenuPath).catch(e => this.logger.error(e));
         return <DebugAction
             key={commandMenuNode.id}
             enabled={commandMenuNode.isEnabled(DebugToolBar.MENU)}

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

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable, inject, named } from '@theia/core/shared/inversify';
-import { ContributionProvider } from '@theia/core';
+import { ContributionProvider, ILogger } from '@theia/core';
 import { DebugConfiguration } from './debug-configuration';
 import { DebuggerDescription, DebugError } from './debug-service';
 
@@ -28,6 +28,9 @@ import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-sch
 @injectable()
 export class DebugAdapterContributionRegistry {
 
+    @inject(ILogger) @named('debug:DebugAdapterContributionRegistry')
+    protected readonly logger: ILogger;
+
     @inject(ContributionProvider) @named(DebugAdapterContribution)
     protected readonly contributions: ContributionProvider<DebugAdapterContribution>;
     protected *getContributions(debugType: string): IterableIterator<DebugAdapterContribution> {
@@ -83,7 +86,7 @@ export class DebugAdapterContributionRegistry {
                     const result = await contribution.provideDebugConfigurations(workspaceFolderUri);
                     configurations.push(...result);
                 } catch (e) {
-                    console.error('provideDebugConfigurations failed:', e);
+                    this.logger.error('provideDebugConfigurations failed:', e);
                 }
             }
         }
@@ -108,7 +111,7 @@ export class DebugAdapterContributionRegistry {
                         return current;
                     }
                 } catch (e) {
-                    console.error('resolveDebugConfiguration failed:', e);
+                    this.logger.error('resolveDebugConfiguration failed:', e);
                 }
             }
         }
@@ -133,7 +136,7 @@ export class DebugAdapterContributionRegistry {
                         return current;
                     }
                 } catch (e) {
-                    console.error('resolveDebugConfigurationWithSubstitutedVariables failed:', e);
+                    this.logger.error('resolveDebugConfigurationWithSubstitutedVariables failed:', e);
                 }
             }
         }
@@ -152,7 +155,7 @@ export class DebugAdapterContributionRegistry {
                 try {
                     schemas.push(...await contribution.getSchemaAttributes());
                 } catch (e) {
-                    console.error('getSchemaAttributes failed:', e);
+                    this.logger.error('getSchemaAttributes failed:', e);
                 }
             }
         }
@@ -165,7 +168,7 @@ export class DebugAdapterContributionRegistry {
                 try {
                     schemas.push(...await contribution.getConfigurationSnippets());
                 } catch (e) {
-                    console.error('getConfigurationSnippets failed:', e);
+                    this.logger.error('getConfigurationSnippets failed:', e);
                 }
             }
         }

package/src/node/debug-service-impl.ts

@@ -14,14 +14,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { DebugConfiguration } from '../common/debug-configuration';
 import { DebugService, DebuggerDescription, DynamicDebugConfigurationProvider } from '../common/debug-service';
 import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-schema';
 import { CommandIdVariables } from '@theia/variable-resolver/lib/common/variable-types';
 import { DebugAdapterSessionManager } from './debug-adapter-session-manager';
 import { DebugAdapterContributionRegistry } from '../common/debug-adapter-contribution-registry';
-import { Event } from '@theia/core';
+import { Event, ILogger } from '@theia/core';
 
 /**
  * DebugService implementation.
@@ -35,6 +35,9 @@ export class DebugServiceImpl implements DebugService {
     @inject(DebugAdapterContributionRegistry)
     protected readonly registry: DebugAdapterContributionRegistry;
 
+    @inject(ILogger) @named('debug:DebugServiceImpl')
+    protected readonly logger: ILogger;
+
     get onDidChangeDebugConfigurationProviders(): Event<void> {
         return Event.None;
     }
@@ -113,7 +116,7 @@ export class DebugServiceImpl implements DebugService {
                     try {
                         await this.doStop(session);
                     } catch (e) {
-                        console.error('terminateDebugSession failed:', e);
+                        this.logger.error('terminateDebugSession failed:', e);
                     }
                 })());
             }