@theia/core 1.75.0-next.29 → 1.75.0-next.34

package/src/browser/keyboard/browser-keyboard-layout-provider.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, postConstruct, inject } from 'inversify';
+import { injectable, postConstruct, inject, named } from 'inversify';
 import { isOSX } from '../../common/os';
 import { Emitter, Event } from '../../common/event';
 import { ILogger } from '../../common/logger';
@@ -29,7 +29,7 @@ export type KeyboardLayoutSource = 'navigator.keyboard' | 'user-choice' | 'press
 @injectable()
 export class BrowserKeyboardLayoutProvider implements KeyboardLayoutProvider, KeyboardLayoutChangeNotifier, KeyValidator {
 
-    @inject(ILogger)
+    @inject(ILogger) @named('core:BrowserKeyboardLayoutProvider')
     protected readonly logger: ILogger;
 
     @inject(LocalStorageService)

package/src/browser/open-with-service.ts

@@ -14,14 +14,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable } from 'inversify';
+import { inject, injectable, named } from 'inversify';
 import { Disposable } from '../common/disposable';
 import { nls } from '../common/nls';
 import { MaybePromise } from '../common/types';
 import { URI } from '../common/uri';
 import { QuickInputService, QuickPickItem, QuickPickItemOrSeparator } from './quick-input';
 import { getDefaultHandler } from './opener-service';
-import { PreferenceService, PreferenceScope } from '../common';
+import { PreferenceService, PreferenceScope, ILogger } from '../common';
 
 export interface OpenWithHandler {
     /**
@@ -74,11 +74,14 @@ export class OpenWithService {
     @inject(PreferenceService)
     protected readonly preferenceService: PreferenceService;
 
+    @inject(ILogger) @named('core:OpenWithService')
+    protected readonly logger: ILogger;
+
     protected readonly handlers: OpenWithHandler[] = [];
 
     registerHandler(handler: OpenWithHandler): Disposable {
         if (this.handlers.some(h => h.id === handler.id)) {
-            console.warn('Duplicate OpenWithHandler registration: ' + handler.id);
+            this.logger.warn('Duplicate OpenWithHandler registration: ' + handler.id);
             return Disposable.NULL;
         }
         this.handlers.push(handler);

package/src/browser/performance/frontend-stopwatch.ts

@@ -14,12 +14,15 @@
 * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 *******************************************************************************/
 
-import { injectable } from 'inversify';
-import { Measurement, MeasurementOptions, Stopwatch } from '../../common';
+import { injectable, inject, named } from 'inversify';
+import { Measurement, MeasurementOptions, Stopwatch, ILogger } from '../../common';
 
 @injectable()
 export class FrontendStopwatch extends Stopwatch {
 
+    @inject(ILogger) @named('core:FrontendStopwatch')
+    protected override readonly logger: ILogger;
+
     constructor() {
         super({
             owner: 'frontend page',
@@ -51,7 +54,7 @@ export class FrontendStopwatch extends Stopwatch {
                 duration = entries[0].duration ?? Number.NaN;
                 startTime = entries[0].startTime ?? Number.NaN;
             } catch (e) {
-                console.warn(e);
+                this.logger.warn(e);
                 duration = Number.NaN;
                 startTime = Number.NaN;
             }

package/src/browser/perspective-service.ts

@@ -196,7 +196,7 @@ export class PerspectiveServiceImpl implements FrontendApplicationContribution,
     @inject(QuickInputService) @optional()
     protected readonly quickInputService: QuickInputService | undefined;
 
-    @inject(ILogger) @named('core:PerspectiveService')
+    @inject(ILogger) @named('core:PerspectiveServiceImpl')
     protected readonly logger: ILogger;
 
     @inject(WidgetAreaResolver)

package/src/browser/preferences/preference-proxy.spec.ts

@@ -28,6 +28,8 @@ import { PreferenceScope } from '../../common/preferences/preference-scope';
 import { FrontendApplicationConfigProvider } from '../frontend-application-config-provider';
 import { PreferenceProxyOptions, PreferenceProxy, PreferenceChangeEvent, createPreferenceProxy } from '../../common/preferences/preference-proxy';
 import { PreferenceProxyFactory } from '../../common/preferences/injectable-preference-proxy';
+import { ILogger } from '../../common/logger';
+import { MockLogger } from '../../common/test/mock-logger';
 
 disableJSDOM();
 
@@ -47,6 +49,7 @@ function createTestContainer(): Container {
     const result = new Container();
     bindPreferenceService(result.bind.bind(result));
     bindMockPreferenceProviders(result.bind.bind(result), result.unbind.bind(result));
+    result.bind(ILogger).to(MockLogger);
     return result;
 }
 

package/src/browser/preferences/preference-service.spec.ts

@@ -28,6 +28,8 @@ import { FrontendApplicationConfigProvider } from '../frontend-application-confi
 import { bindMockPreferenceProviders, MockPreferenceProvider } from './test';
 import { PreferenceChangeEvent, createPreferenceProxy } from '../../common/preferences/preference-proxy';
 import { bindPreferenceService } from '../frontend-application-bindings';
+import { ILogger } from '../../common/logger';
+import { MockLogger } from '../../common/test/mock-logger';
 
 disableJSDOM();
 
@@ -43,6 +45,7 @@ function createTestContainer(): Container {
     const result = new Container();
     bindPreferenceService(result.bind.bind(result));
     bindMockPreferenceProviders(result.bind.bind(result), result.unbind.bind(result));
+    result.bind(ILogger).to(MockLogger);
     return result;
 }
 

package/src/browser/preferences/preference-validation-service.ts

@@ -175,7 +175,7 @@ export class PreferenceValidationService {
             const configuredDefault = this.getDefaultFromSchema(schema);
             return this.validateOneOf(key, configuredDefault, { ...schema, default: undefined });
         }
-        console.log(`While validating ${key}, failed to find a valid value or default value. Using configured value ${value}.`);
+        this.logger.info(`While validating ${key}, failed to find a valid value or default value. Using configured value ${value}.`);
         return value;
     }
 

package/src/browser/saveable-service.ts

@@ -16,7 +16,7 @@
 
 import type { ApplicationShell } from './shell';
 import { inject, injectable, named } from 'inversify';
-import { ContributionProvider, UNTITLED_SCHEME, URI, Disposable, DisposableCollection, Emitter, Event } from '../common';
+import { ContributionProvider, UNTITLED_SCHEME, URI, Disposable, DisposableCollection, Emitter, Event, ILogger } from '../common';
 import { Navigatable, NavigatableWidget } from './navigatable-types';
 import { AutoSaveMode, Saveable, SaveableSource, SaveableWidget, SaveOptions, SaveReason, setDirty, close, PostCreationSaveableWidget, ShouldSaveDialog } from './saveable';
 import { waitForClosed, Widget } from './widgets';
@@ -53,6 +53,9 @@ export class SaveableService implements FrontendApplicationContribution {
     @inject(WindowFocusService)
     protected readonly windowFocusService: WindowFocusService;
 
+    @inject(ILogger) @named('core:SaveableService')
+    protected readonly logger: ILogger;
+
     protected saveThrottles = new Map<Widget, AutoSaveThrottle>();
     protected saveMode: AutoSaveMode = 'off';
     protected saveDelay = 1000;
@@ -284,7 +287,7 @@ export class SaveableService implements FrontendApplicationContribution {
         }
         const saveable = Saveable.get(widget);
         if (!saveable) {
-            console.warn('Saveable.get returned undefined on a known saveable widget. This is unexpected.');
+            this.logger.warn('Saveable.get returned undefined on a known saveable widget. This is unexpected.');
         }
         // Enter branch if saveable absent since we cannot check autosaveability more definitely.
         if (this.autoSave !== 'off' && (!saveable || this.shouldAutoSave(widget, saveable))) {

package/src/browser/shell/shell-layout-restorer.ts

@@ -154,7 +154,8 @@ export class ShellLayoutRestorer implements CommandContribution {
 
     constructor(
         @inject(WidgetManager) protected widgetManager: WidgetManager,
-        @inject(ILogger) protected logger: ILogger,
+        @inject(ILogger) @named('core:ShellLayoutRestorer')
+        protected readonly logger: ILogger,
         @inject(StorageService) protected storageService: StorageService) { }
 
     registerCommands(commands: CommandRegistry): void {
@@ -374,18 +375,18 @@ export class ShellLayoutRestorer implements CommandContribution {
         }
         if (layoutVersion !== applicationShellLayoutVersion) {
             if (layoutVersion < applicationShellLayoutVersion) {
-                console.warn(`Layout version ${layoutVersion} is behind current layout version ${applicationShellLayoutVersion}, trying to migrate...`);
+                this.logger.warn(`Layout version ${layoutVersion} is behind current layout version ${applicationShellLayoutVersion}, trying to migrate...`);
             } else {
-                console.warn(`Layout version ${layoutVersion} is ahead current layout version ${applicationShellLayoutVersion}, trying to load anyway...`);
+                this.logger.warn(`Layout version ${layoutVersion} is ahead current layout version ${applicationShellLayoutVersion}, trying to load anyway...`);
             }
-            console.info(`Please use '${RESET_LAYOUT.label}' command if the layout looks bogus.`);
+            this.logger.info(`Please use '${RESET_LAYOUT.label}' command if the layout looks bogus.`);
         }
 
         const migrations = this.migrations.getContributions()
             .filter(m => m.layoutVersion > layoutVersion && m.layoutVersion <= applicationShellLayoutVersion)
             .sort((m, m2) => m.layoutVersion - m2.layoutVersion);
         if (migrations.length) {
-            console.info(`Found ${migrations.length} migrations from layout version ${layoutVersion} to version ${applicationShellLayoutVersion}, migrating...`);
+            this.logger.info(`Found ${migrations.length} migrations from layout version ${layoutVersion} to version ${applicationShellLayoutVersion}, migrating...`);
         }
 
         const context = { layout, layoutVersion, migrations };

package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts

@@ -17,7 +17,7 @@
 import debounce = require('lodash.debounce');
 import { inject, injectable, named } from 'inversify';
 // eslint-disable-next-line max-len
-import { CommandRegistry, ContributionProvider, Disposable, DisposableCollection, Emitter, Event, MenuModelRegistry, MenuPath } from '../../../common';
+import { CommandRegistry, ContributionProvider, Disposable, DisposableCollection, Emitter, Event, MenuModelRegistry, MenuPath, ILogger } from '../../../common';
 import { ContextKeyService } from '../../context-key-service';
 import { FrontendApplicationContribution } from '../../frontend-application-contribution';
 import { Widget } from '../../widgets';
@@ -68,6 +68,9 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
     @inject(ContributionProvider) @named(TabBarToolbarContribution)
     protected readonly contributionProvider: ContributionProvider<TabBarToolbarContribution>;
 
+    @inject(ILogger) @named('core:TabBarToolbarRegistry')
+    protected readonly logger: ILogger;
+
     protected readonly onDidChangeEmitter = new Emitter<void>();
     readonly onDidChange: Event<void> = this.onDidChangeEmitter.event;
     // debounce in order to avoid to fire more than once in the same tick
@@ -223,7 +226,7 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
             this.fireOnDidChange();
             return { dispose: () => this.unregisterMenuDelegate(menuPath) };
         }
-        console.warn('Unable to register menu delegate. Delegate has already been registered', menuPath);
+        this.logger.warn('Unable to register menu delegate. Delegate has already been registered', menuPath);
         return Disposable.NULL;
     }
 

package/src/browser/status-bar/status-bar-view-model.ts

@@ -14,8 +14,8 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable } from 'inversify';
-import { ArrayUtils, Emitter, Event } from '../../common';
+import { injectable, inject, named } from 'inversify';
+import { ArrayUtils, Emitter, Event, ILogger } from '../../common';
 import { StatusBarAlignment, StatusBarEntry, StatusBarViewEntry, StatusBarViewModelEntry } from './status-bar-types';
 
 interface EntryLocation {
@@ -30,6 +30,10 @@ export class StatusBarViewModel {
     protected rightTree = new Array<StatusBarViewModelEntry>();
     protected containerPointers = new Map<string, StatusBarViewModelEntry[]>();
     protected onDidChangeEmitter = new Emitter<void>();
+
+    @inject(ILogger) @named('core:StatusBarViewModel')
+    protected readonly logger: ILogger;
+
     get onDidChange(): Event<void> {
         return this.onDidChangeEmitter.event;
     }
@@ -53,7 +57,7 @@ export class StatusBarViewModel {
     *getChildren(list: StatusBarViewModelEntry[], alignment: StatusBarAlignment, compact?: boolean): IterableIterator<StatusBarViewEntry> {
         for (const item of list) {
             if (item.leftChildren.length || item.rightChildren.length) {
-                console.warn(`Found embedded entries with affinity to ${item.id}. They will inherit alignment and compactness of parent.`);
+                this.logger.warn(`Found embedded entries with affinity to ${item.id}. They will inherit alignment and compactness of parent.`);
             }
             yield* this.getChildren(item.leftChildren, alignment, item.head.affinity?.compact);
             yield { entry: item.head, id: item.id, alignment, compact: compact || item.head.affinity?.compact };

package/src/browser/storage-service.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable, postConstruct } from 'inversify';
+import { inject, injectable, postConstruct, named } from 'inversify';
 import { ILogger } from '../common/logger';
 import { MessageService } from '../common/message-service';
 import { WindowService } from './window/window-service';
@@ -47,7 +47,9 @@ interface LocalStorage {
 export class LocalStorageService implements StorageService {
     private storage: LocalStorage;
 
-    @inject(ILogger) protected logger: ILogger;
+    @inject(ILogger) @named('core:LocalStorageService')
+    protected readonly logger: ILogger;
+
     @inject(MessageService) protected readonly messageService: MessageService;
     @inject(WindowService) protected readonly windowService: WindowService;
 

package/src/browser/tree/tree-model.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable, postConstruct } from 'inversify';
+import { inject, injectable, postConstruct, named } from 'inversify';
 import { Event, Emitter, WaitUntilEvent } from '../../common/event';
 import { DisposableCollection } from '../../common/disposable';
 import { CancellationToken } from '../../common/cancellation';
@@ -165,7 +165,9 @@ export interface TreeModel extends Tree, TreeSelectionService, TreeExpansionServ
 @injectable()
 export class TreeModelImpl implements TreeModel, SelectionProvider<ReadonlyArray<Readonly<SelectableTreeNode>>> {
 
-    @inject(ILogger) protected readonly logger: ILogger;
+    @inject(ILogger) @named('core:TreeModelImpl')
+    protected readonly logger: ILogger;
+
     @inject(Tree) protected readonly tree: Tree;
     @inject(TreeSelectionService) protected readonly selectionService: TreeSelectionService;
     @inject(TreeExpansionService) protected readonly expansionService: TreeExpansionService;

package/src/browser/widget-manager.ts

@@ -119,7 +119,7 @@ export class WidgetManager {
     @inject(ContributionProvider) @named(WidgetFactory)
     protected readonly factoryProvider: ContributionProvider<WidgetFactory>;
 
-    @inject(ILogger)
+    @inject(ILogger) @named('core:WidgetManager')
     protected readonly logger: ILogger;
 
     protected readonly onWillCreateWidgetEmitter = new Emitter<WillCreateWidgetEvent>();

package/src/browser/window/default-secondary-window-service.ts

@@ -13,13 +13,13 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-import { inject, injectable, postConstruct } from 'inversify';
+import { inject, injectable, postConstruct, named } from 'inversify';
 import { SecondaryWindow, SecondaryWindowService } from './secondary-window-service';
 import { WindowService } from './window-service';
 import { ExtractableWidget, Widget } from '../widgets';
 import { ApplicationShell } from '../shell';
 import { Saveable } from '../saveable';
-import { Emitter, environment, Event, PreferenceService } from '../../common';
+import { Emitter, environment, Event, PreferenceService, ILogger } from '../../common';
 import { SaveableService } from '../saveable-service';
 import { getAllWidgetsFromSecondaryWindow, getDefaultRestoreArea } from '../secondary-window-handler';
 import { WindowFocusService } from './window-focus-service';
@@ -59,17 +59,20 @@ export class DefaultSecondaryWindowService implements SecondaryWindowService {
     @inject(WindowFocusService)
     protected readonly windowFocusService: WindowFocusService;
 
+    @inject(ILogger) @named('core:DefaultSecondaryWindowService')
+    protected readonly logger: ILogger;
+
     @postConstruct()
     init(): void {
         // Set up messaging with secondary windows
         window.addEventListener('message', (event: MessageEvent) => {
-            console.trace('Message on main window', event);
+            this.logger.trace('Message on main window', event);
             if (event.data.fromSecondary) {
-                console.trace('Message comes from secondary window');
+                this.logger.trace('Message comes from secondary window');
                 return;
             }
             if (event.data.fromMain) {
-                console.trace('Message has mainWindow marker, therefore ignore it');
+                this.logger.trace('Message has mainWindow marker, therefore ignore it');
                 return;
             }
 
@@ -80,7 +83,7 @@ export class DefaultSecondaryWindowService implements SecondaryWindowService {
                 return;
             }
 
-            console.trace('Delegate main window message to secondary windows', event);
+            this.logger.trace('Delegate main window message to secondary windows', event);
             this.secondaryWindows.forEach(secondaryWindow => {
                 if (!secondaryWindow.window.closed) {
                     secondaryWindow.window.postMessage({ ...event.data, fromMain: true }, '*');

package/src/common/message-service-protocol.ts

@@ -14,9 +14,10 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable } from 'inversify';
+import { injectable, inject, named } from 'inversify';
 import { CancellationToken } from './cancellation';
 import { nls } from './nls';
+import { ILogger } from './logger';
 
 export const messageServicePath = '/services/messageService';
 
@@ -115,6 +116,9 @@ export interface ProgressUpdate {
 @injectable()
 export class MessageClient {
 
+    @inject(ILogger) @named('core:MessageClient')
+    protected readonly logger: ILogger;
+
     /**
      * Show a message of the given type and possible actions to the user.
      * Resolve to a chosen action.
@@ -123,7 +127,7 @@ export class MessageClient {
      * To be implemented by an extension, e.g. by the messages extension.
      */
     showMessage(message: Message): Promise<string | undefined> {
-        console.info(message.text);
+        this.logger.info(message.text);
         return Promise.resolve(undefined);
     }
 
@@ -133,7 +137,7 @@ export class MessageClient {
      * To be implemented by an extension, e.g. by the messages extension.
      */
     showProgress(progressId: string, message: ProgressMessage, cancellationToken: CancellationToken): Promise<string | undefined> {
-        console.info(message.text);
+        this.logger.info(message.text);
         return Promise.resolve(undefined);
     }
 

package/src/common/performance/stopwatch.ts

@@ -16,7 +16,7 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { inject, injectable, unmanaged } from 'inversify';
+import { inject, injectable, unmanaged, named } from 'inversify';
 import { ILogger, LogLevel } from '../logger';
 import { MaybePromise } from '../types';
 import { Measurement, MeasurementOptions, MeasurementResult } from './measurement';
@@ -48,7 +48,7 @@ interface LogOptions extends MeasurementOptions {
 @injectable()
 export abstract class Stopwatch {
 
-    @inject(ILogger)
+    @inject(ILogger) @named('core:Stopwatch')
     protected readonly logger: ILogger;
 
     protected _storedMeasurements: MeasurementResult[] = [];

package/src/common/preferences/preference-schema-service.ts

@@ -24,6 +24,7 @@ import { PreferenceScope, ValidPreferenceScopes } from './preference-scope';
 import { PreferenceUtils } from './preference-provider';
 import { ContributionProvider } from '../contribution-provider';
 import { Deferred } from '../promise-util';
+import { ILogger } from '../logger';
 
 export const NO_OVERRIDE = {};
 export const OVERRIDE_PROPERTY = '\\[(.*)\\]$';
@@ -78,6 +79,9 @@ export class PreferenceSchemaServiceImpl implements PreferenceSchemaService {
     @inject(ContributionProvider) @named(PreferenceContribution)
     protected readonly preferenceContributions: ContributionProvider<PreferenceContribution>;
 
+    @inject(ILogger) @named('core:PreferenceSchemaServiceImpl')
+    protected readonly logger: ILogger;
+
     @postConstruct()
     protected init(): void {
         for (const scope of this.validScopes) {
@@ -128,7 +132,7 @@ export class PreferenceSchemaServiceImpl implements PreferenceSchemaService {
 
         for (const [key, property] of Object.entries(schema.properties)) {
             if (this.properties.has(key)) {
-                console.warn(`Property with id '${key}' already exists`);
+                this.logger.warn(`Property with id '${key}' already exists`);
                 continue;
             }
             this.pendingDefaultRegistrationWarnings?.delete(key);
@@ -210,14 +214,14 @@ export class PreferenceSchemaServiceImpl implements PreferenceSchemaService {
             this.setJSONSchemasProperty(key, updatedProperty);
             this.schemaChangedEmitter.fire();
         } else {
-            console.warn(`Trying to update non-existent property ${key}`);
+            this.logger.warn(`Trying to update non-existent property ${key}`);
         }
     }
 
     protected pendingDefaultRegistrationWarnings: Set<string> | undefined = new Set();
     protected logDefaultRegistrationWarnings(): void {
         if (this.pendingDefaultRegistrationWarnings?.size) {
-            console.warn('Default overrides registered for these keys, but preferences not registered', Array.from(this.pendingDefaultRegistrationWarnings));
+            this.logger.warn('Default overrides registered for these keys, but preferences not registered', Array.from(this.pendingDefaultRegistrationWarnings));
         }
         this.pendingDefaultRegistrationWarnings = undefined;
     }
@@ -226,7 +230,7 @@ export class PreferenceSchemaServiceImpl implements PreferenceSchemaService {
         if (this.pendingDefaultRegistrationWarnings) {
             this.pendingDefaultRegistrationWarnings.add(key);
         } else {
-            console.warn(`Trying to register default override for non-existent preference: ${key}`);
+            this.logger.warn(`Trying to register default override for non-existent preference: ${key}`);
         }
     }
 
@@ -236,7 +240,7 @@ export class PreferenceSchemaServiceImpl implements PreferenceSchemaService {
         if (!property) {
             this.logDefaultRegistrationWarning(key);
         } else if (!property.overridable && overrideIdentifier) {
-            console.warn(`Trying to register default override for identifier ${overrideIdentifier} for non-overridable preference: ${key}`);
+            this.logger.warn(`Trying to register default override for identifier ${overrideIdentifier} for non-overridable preference: ${key}`);
         }
 
         let overrides = this.defaultOverrides.get(key);

package/src/common/preferences/preference-service.ts

@@ -17,7 +17,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { JSONValue } from '@lumino/coreutils';
-import { inject, injectable, postConstruct } from 'inversify';
+import { inject, injectable, postConstruct, named } from 'inversify';
 import { Disposable, DisposableCollection } from '../disposable';
 import { Emitter, Event } from '../event';
 import { Deferred } from '../promise-util';
@@ -29,6 +29,7 @@ import { PreferenceScope } from './preference-scope';
 import { PreferenceConfigurations } from './preference-configurations';
 import { deepFreeze } from '../objects';
 import { unreachable } from '../types';
+import { ILogger } from '../logger';
 
 /**
  * Representation of a preference change. A preference value can be set to `undefined` for a specific scope.
@@ -296,6 +297,9 @@ export class PreferenceServiceImpl implements PreferenceService {
     @inject(PreferenceLanguageOverrideService)
     protected readonly preferenceOverrideService: PreferenceLanguageOverrideService;
 
+    @inject(ILogger) @named('core:PreferenceServiceImpl')
+    protected readonly logger: ILogger;
+
     protected readonly preferenceProviders = new Map<PreferenceScope, PreferenceProvider>();
 
     protected async initializeProviders(): Promise<void> {
@@ -309,7 +313,7 @@ export class PreferenceServiceImpl implements PreferenceService {
                     ));
                     await provider.ready;
                 } else {
-                    console.warn(`No preference provider bound for ${PreferenceScope[scope]}`);
+                    this.logger.warn(`No preference provider bound for ${PreferenceScope[scope]}`);
                 }
             }
             this._ready.resolve();

package/src/node/backend-application.spec.ts

@@ -142,7 +142,8 @@ describe('BackendApplication', () => {
             const container = createTestContainer();
             const cleanupError = new Error('cleanup boom');
             sandbox.stub(container, 'unbindAllAsync').rejects(cleanupError);
-            const warnStub = sandbox.stub(console, 'warn');
+            const mockLogger = container.get(ILogger) as ILogger;
+            const warnStub = sandbox.stub(mockLogger, 'warn');
 
             const app = container.get(TestBackendApplication);
 
@@ -157,7 +158,8 @@ describe('BackendApplication', () => {
             const clock = sandbox.useFakeTimers();
             const container = createTestContainer();
             sandbox.stub(container, 'unbindAllAsync').returns(new Promise<void>(() => { /* never */ }));
-            const warnStub = sandbox.stub(console, 'warn');
+            const mockLogger = container.get(ILogger) as ILogger;
+            const warnStub = sandbox.stub(mockLogger, 'warn');
 
             const app = container.get(TestBackendApplication);
 
@@ -220,7 +222,8 @@ describe('BackendApplication', () => {
                 onStop: () => new Promise<void>(() => { /* never */ })
             });
             const unbindSpy = sandbox.spy(container, 'unbindAllAsync');
-            const warnStub = sandbox.stub(console, 'warn');
+            const mockLogger = container.get(ILogger) as ILogger;
+            const warnStub = sandbox.stub(mockLogger, 'warn');
 
             const app = container.get(TestBackendApplication);
             const shutdownPromise = app.invokeGracefulShutdown();

package/src/node/backend-application.ts

@@ -226,7 +226,7 @@ export class BackendApplication {
 
         // Handles `Ctrl+C` and `kill pid`. Delegates to gracefulShutdown so that
         // root-scoped singletons get their @preDestroy hooks invoked before exit.
-        const onSignal = () => { this.gracefulShutdown().catch(err => console.error(err)); };
+        const onSignal = () => { this.gracefulShutdown().catch(err => this.logger.error(err)); };
         process.on('SIGINT', onSignal);
         process.on('SIGTERM', onSignal);
     }
@@ -407,7 +407,7 @@ export class BackendApplication {
             ]);
         } catch (err) {
             const message = err instanceof Error ? err.message : String(err);
-            console.warn(`Backend contributions cleanup failed: ${message}`);
+            this.logger.warn(`Backend contributions cleanup failed: ${message}`);
         }
 
         try {
@@ -417,7 +417,7 @@ export class BackendApplication {
             ]);
         } catch (err) {
             const message = err instanceof Error ? err.message : String(err);
-            console.warn(`Backend root container cleanup failed: ${message}`);
+            this.logger.warn(`Backend root container cleanup failed: ${message}`);
         }
 
         process.exit(1);
@@ -428,7 +428,7 @@ export class BackendApplication {
             return;
         }
         this.stoppedContributions = true;
-        console.info('>>> Stopping backend contributions...');
+        this.logger.info('>>> Stopping backend contributions...');
         // The `async` wrapper converts a synchronous throw inside a non-async
         // contribution's `onStop` into a rejected promise so the per-contribution
         // try/catch can handle it; otherwise `Promise.all` would abort.
@@ -441,7 +441,7 @@ export class BackendApplication {
                 }
             }
         }));
-        console.info('<<< All backend contributions have been stopped.');
+        this.logger.info('<<< All backend contributions have been stopped.');
     }
 
     protected onStop(): void {

package/src/node/env-variables/env-variables-server.ts

@@ -16,7 +16,7 @@
 
 import { join } from 'path';
 import { homedir } from 'os';
-import { injectable } from 'inversify';
+import { injectable, inject, named } from 'inversify';
 import * as drivelist from 'drivelist';
 import { pathExists, mkdir } from 'fs-extra';
 import { EnvVariable, EnvVariablesServer } from '../../common/env-variables';
@@ -24,6 +24,7 @@ import { isWindows } from '../../common/os';
 import { FileUri } from '../../common/file-uri';
 import { BackendApplicationPath } from '../backend-application';
 import { BackendApplicationConfigProvider } from '../backend-application-config-provider';
+import { ILogger } from '../../common/logger';
 
 @injectable()
 export class EnvVariablesServerImpl implements EnvVariablesServer {
@@ -33,9 +34,12 @@ export class EnvVariablesServerImpl implements EnvVariablesServer {
     protected readonly configDirUri: Promise<string>;
     protected readonly pathExistenceCache: { [key: string]: boolean } = {};
 
+    @inject(ILogger) @named('core:EnvVariablesServerImpl')
+    protected readonly logger: ILogger;
+
     constructor() {
         this.configDirUri = this.createConfigDirUri();
-        this.configDirUri.then(configDirUri => console.log(`Configuration directory URI: '${configDirUri}'`));
+        this.configDirUri.then(configDirUri => this.logger.info(`Configuration directory URI: '${configDirUri}'`));
         const prEnv = process.env;
         Object.keys(prEnv).forEach((key: string) => {
             let keyName = key;