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

package/lib/node/process-utils.spec.js

@@ -16,8 +16,11 @@
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
+const sinon = require("sinon");
 const inversify_1 = require("inversify");
 const process_utils_1 = require("./process-utils");
+const common_1 = require("../common");
+const mock_logger_1 = require("../common/test/mock-logger");
 /** PPID, PID */
 const mockPsOutput = `\
      5     6
@@ -33,6 +36,7 @@ describe('ProcessUtils', () => {
     beforeEach(() => {
         const container = new inversify_1.Container();
         container.bind(process_utils_1.ProcessUtils).toSelf().inSingletonScope();
+        container.bind(common_1.ILogger).to(mock_logger_1.MockLogger).inSingletonScope();
         coreProcessManager = container.get(process_utils_1.ProcessUtils);
     });
     it('ProcessUtils#unixGetChildrenRecursive', () => {
@@ -43,8 +47,7 @@ describe('ProcessUtils', () => {
     });
     describe('#unixTerminateProcessTree', () => {
         let originalKill;
-        let originalConsoleError;
-        let loggedErrors;
+        let errorStub;
         function throwingKill(code) {
             return (() => {
                 const error = new Error(`kill ${code}`);
@@ -54,32 +57,31 @@ describe('ProcessUtils', () => {
         }
         beforeEach(() => {
             originalKill = process.kill;
-            originalConsoleError = console.error;
-            loggedErrors = [];
-            console.error = (...args) => { loggedErrors.push(args); };
+            const mockLogger = coreProcessManager.logger;
+            errorStub = sinon.stub(mockLogger, 'error');
             // One child plus the parent; report the parent as its own group leader so the `kill(-ppid)` branch runs too.
             coreProcessManager['unixGetChildrenRecursive'] = () => new Set([424242]);
             coreProcessManager['unixGetPGID'] = (pid) => pid;
         });
         afterEach(() => {
             process.kill = originalKill;
-            console.error = originalConsoleError;
+            sinon.restore();
         });
         it('does not throw or log when processes in the tree are already gone (ESRCH)', () => {
             process.kill = throwingKill('ESRCH');
             (0, chai_1.expect)(() => coreProcessManager['unixTerminateProcessTree'](424243)).to.not.throw();
-            (0, chai_1.expect)(loggedErrors).to.be.empty;
+            (0, chai_1.expect)(errorStub.called).to.be.false;
         });
         it('logs unexpected kill errors (e.g. EPERM) without throwing', () => {
             process.kill = throwingKill('EPERM');
             (0, chai_1.expect)(() => coreProcessManager['unixTerminateProcessTree'](424243)).to.not.throw();
-            (0, chai_1.expect)(loggedErrors).to.not.be.empty;
+            (0, chai_1.expect)(errorStub.called).to.be.true;
         });
         it('does not throw when a kill rejects with a value that has no code (e.g. undefined)', () => {
             const thrown = undefined;
             process.kill = (() => { throw thrown; });
             (0, chai_1.expect)(() => coreProcessManager['unixTerminateProcessTree'](424243)).to.not.throw();
-            (0, chai_1.expect)(loggedErrors).to.not.be.empty;
+            (0, chai_1.expect)(errorStub.called).to.be.true;
         });
     });
 });

package/lib/node/process-utils.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-utils.spec.js","sourceRoot":"","sources":["../../src/node/process-utils.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"process-utils.spec.js","sourceRoot":"","sources":["../../src/node/process-utils.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.73.0-next.20+f7f30c799",
+  "version": "1.73.0-next.26+d6f45631a",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
@@ -17,8 +17,8 @@
     "@lumino/virtualdom": "^2.0.4",
     "@lumino/widgets": "2.7.5",
     "@parcel/watcher": "^2.5.6",
-    "@theia/application-package": "1.73.0-next.20+f7f30c799",
-    "@theia/request": "1.73.0-next.20+f7f30c799",
+    "@theia/application-package": "1.73.0-next.26+d6f45631a",
+    "@theia/request": "1.73.0-next.26+d6f45631a",
     "@types/body-parser": "^1.19.6",
     "@types/express": "^4.17.25",
     "@types/fs-extra": "^4.0.15",
@@ -221,5 +221,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "f7f30c799bad3eeeb4daa01583a7083a9d58c26d"
+  "gitHead": "d6f45631a893ad1944a87db5aaf4bc94c64b1c60"
 }

package/src/browser/authentication-service.ts

@@ -20,13 +20,14 @@
  *--------------------------------------------------------------------------------------------*/
 // code copied and modified from https://github.com/microsoft/vscode/blob/1.47.3/src/vs/workbench/services/authentication/browser/authenticationService.ts
 
-import { injectable, inject, postConstruct } from 'inversify';
+import { injectable, inject, postConstruct, named } from 'inversify';
 import { Emitter, Event } from '../common/event';
 import { StorageService } from '../browser/storage-service';
 import { Disposable, DisposableCollection } from '../common/disposable';
 import { ACCOUNTS_MENU, ACCOUNTS_SUBMENU, MenuModelRegistry } from '../common/menu';
 import { Command, CommandRegistry } from '../common/command';
 import { nls } from '../common/nls';
+import { ILogger } from '../common/logger';
 
 export interface AuthenticationSessionAccountInformation {
     readonly id: string;
@@ -202,6 +203,8 @@ export class AuthenticationServiceImpl implements AuthenticationService {
     @inject(MenuModelRegistry) protected readonly menus: MenuModelRegistry;
     @inject(CommandRegistry) protected readonly commands: CommandRegistry;
     @inject(StorageService) protected readonly storageService: StorageService;
+    @inject(ILogger) @named('core:AuthenticationServiceImpl')
+    protected readonly logger: ILogger;
 
     @postConstruct()
     init(): void {
@@ -308,7 +311,7 @@ export class AuthenticationServiceImpl implements AuthenticationService {
             this.onDidUnregisterAuthenticationProviderEmitter.fire({ id, label: provider.label });
             this.updateAccountsMenuItem();
         } else {
-            console.error(`Failed to unregister an authentication provider. A provider with id '${id}' was not found.`);
+            this.logger.error(`Failed to unregister an authentication provider. A provider with id '${id}' was not found.`);
         }
         this.authenticationProviderDisposables.get(id)?.dispose();
         this.authenticationProviderDisposables.delete(id);
@@ -325,7 +328,7 @@ export class AuthenticationServiceImpl implements AuthenticationService {
                 await this.updateNewSessionRequests(provider);
             }
         } else {
-            console.error(`Failed to update an authentication session. An authentication provider with id '${id}' was not found.`);
+            this.logger.error(`Failed to update an authentication session. An authentication provider with id '${id}' was not found.`);
         }
     }
 

package/src/browser/frontend-application.ts

@@ -27,6 +27,7 @@ import { CorePreferences } from '../common/core-preferences';
 import { WindowService } from './window/window-service';
 import { TooltipService } from './tooltip-service';
 import { FrontendApplicationContribution } from './frontend-application-contribution';
+import { ILogger } from '../common/logger';
 
 const TIMER_WARNING_THRESHOLD = 100;
 
@@ -48,6 +49,9 @@ export class FrontendApplication {
     @inject(BackendStopwatch)
     protected readonly backendStopwatch: BackendStopwatch;
 
+    @inject(ILogger) @named('core:FrontendApplication')
+    protected readonly logger: ILogger;
+
     private settlementContext?: MeasurementContext<FrontendApplicationContribution>;
 
     constructor(
@@ -217,10 +221,10 @@ export class FrontendApplication {
             return await this.layoutRestorer.restoreLayout(this);
         } catch (error) {
             if (ApplicationShellLayoutMigrationError.is(error)) {
-                console.warn(error.message);
-                console.info('Initializing the default layout instead...');
+                this.logger.warn(error.message);
+                this.logger.info('Initializing the default layout instead...');
             } else {
-                console.error('Could not restore layout', error);
+                this.logger.error('Could not restore layout', error);
             }
             return false;
         }
@@ -258,7 +262,7 @@ export class FrontendApplication {
                     await this.measureContribution(contribution, 'initialize',
                         () => contribution.initialize!());
                 } catch (error) {
-                    console.error('Could not initialize contribution', error);
+                    this.logger.error('Could not initialize contribution', error);
                 }
             }
         }
@@ -269,7 +273,7 @@ export class FrontendApplication {
                     await this.measureContribution(contribution, 'configure',
                         () => contribution.configure!(this));
                 } catch (error) {
-                    console.error('Could not configure contribution', error);
+                    this.logger.error('Could not configure contribution', error);
                 }
             }
         }
@@ -294,7 +298,7 @@ export class FrontendApplication {
                     await this.measureContribution(contribution, 'onStart',
                         () => contribution.onStart!(this));
                 } catch (error) {
-                    console.error('Could not start contribution', error);
+                    this.logger.error('Could not start contribution', error);
                 }
             }
         }
@@ -304,17 +308,17 @@ export class FrontendApplication {
      * Stop the frontend application contributions. This is called when the window is unloaded.
      */
     protected stopContributions(): void {
-        console.info('>>> Stopping frontend contributions...');
+        this.logger.info('>>> Stopping frontend contributions...');
         for (const contribution of this.contributions.getContributions()) {
             if (contribution.onStop) {
                 try {
                     contribution.onStop(this);
                 } catch (error) {
-                    console.error('Could not stop contribution', error);
+                    this.logger.error('Could not stop contribution', error);
                 }
             }
         }
-        console.info('<<< All frontend contributions have been stopped.');
+        this.logger.info('<<< All frontend contributions have been stopped.');
     }
 
     protected async measureContribution<T>(contribution: FrontendApplicationContribution, hook: string, fn: () => MaybePromise<T>): Promise<T> {

package/src/browser/json-schema-store.ts

@@ -20,6 +20,7 @@ import { FrontendApplicationContribution } from './frontend-application-contribu
 import { Emitter, MaybePromise, URI } from '../common';
 import { timeout, Deferred } from '../common/promise-util';
 import { IJSONSchema } from '../common/json-schema';
+import { ILogger } from '../common/logger';
 
 export interface JsonSchemaConfiguration {
     fileMatch: string | string[];
@@ -41,6 +42,9 @@ export class JsonSchemaStore implements FrontendApplicationContribution {
     @inject(ContributionProvider) @named(JsonSchemaContribution)
     protected readonly contributions: ContributionProvider<JsonSchemaContribution>;
 
+    @inject(ILogger) @named('core:JsonSchemaStore')
+    protected readonly logger: ILogger;
+
     protected readonly _schemas = new Deferred<JsonSchemaConfiguration[]>();
     get schemas(): Promise<JsonSchemaConfiguration[]> {
         return this._schemas.promise;
@@ -68,9 +72,9 @@ export class JsonSchemaStore implements FrontendApplicationContribution {
             if (result) {
                 pendingRegistrations.push(result.then(() => { }, e => {
                     if (e instanceof Error && e.message === frozenErrorCode) {
-                        console.error(`${contribution.constructor.name}.registerSchemas is taking more than ${registerTimeout.toFixed(1)} ms, new schemas are ignored.`);
+                        this.logger.error(`${contribution.constructor.name}.registerSchemas is taking more than ${registerTimeout.toFixed(1)} ms, new schemas are ignored.`);
                     } else {
-                        console.error(e);
+                        this.logger.error(e);
                     }
                 }));
             }

package/src/browser/keybinding.ts

@@ -128,7 +128,7 @@ export class KeybindingRegistry {
     @inject(StatusBar)
     protected readonly statusBar: StatusBar;
 
-    @inject(ILogger)
+    @inject(ILogger) @named('core:KeybindingRegistry')
     protected readonly logger: ILogger;
 
     @inject(ContextKeyService)
@@ -545,7 +545,7 @@ export class KeybindingRegistry {
             if (command) {
                 if (this.commandRegistry.isEnabled(binding.command, binding.args)) {
                     this.commandRegistry.executeCommand(binding.command, binding.args)
-                        .catch(e => console.error('Failed to execute command:', e));
+                        .catch(e => this.logger.error('Failed to execute command:', e));
                 }
 
                 /* Note that if a keybinding is in context but the command is

package/src/browser/preferences/frontend-config-preference-contributions.ts

@@ -14,16 +14,21 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable } from 'inversify';
+import { injectable, named, inject } from 'inversify';
 import { PreferenceContribution, PreferenceSchema, PreferenceSchemaService } from '../../common/preferences/preference-schema';
 import { FrontendApplicationConfigProvider } from '../frontend-application-config-provider';
 import { FrontendApplicationPreferenceConfig } from './preference-contribution';
 import { PreferenceLanguageOverrideService } from '../../common/preferences/preference-language-override-service';
 import { PreferenceScope } from '../../common/preferences';
 import { DefaultTheme } from '@theia/application-package/lib/application-props';
+import { ILogger } from '../../common/logger';
 
 @injectable()
 export class FrontendConfigPreferenceContribution implements PreferenceContribution {
+
+    @inject(ILogger) @named('core:FrontendConfigPreferenceContribution')
+    protected readonly logger: ILogger;
+
     schema: PreferenceSchema = { scope: PreferenceScope.Folder, properties: {} };
     async initSchema(service: PreferenceSchemaService): Promise<void> {
         const config = FrontendApplicationConfigProvider.get();
@@ -44,7 +49,7 @@ export class FrontendConfigPreferenceContribution implements PreferenceContribut
                     }
                 }
             } catch (e) {
-                console.error('Failed to load preferences from frontend configuration.', e);
+                this.logger.error('Failed to load preferences from frontend configuration.', e);
             }
         }
     }

package/src/browser/preferences/preference-schema-provider.spec.ts

@@ -24,6 +24,8 @@ import { bindPreferenceService } from '../frontend-application-bindings';
 import { FrontendApplicationConfigProvider } from '../frontend-application-config-provider';
 import { IndexedAccess, PreferenceDataProperty, PreferenceSchemaService } from '../../common/preferences/preference-schema';
 import { PreferenceProvider, PreferenceProviderProvider, PreferenceScope } from '../../common/preferences';
+import { ILogger } from '../../common';
+import { MockLogger } from '../../common/test/mock-logger';
 
 disableJSDOM();
 
@@ -38,6 +40,9 @@ let testContainer: Container;
 function createTestContainer(): Container {
     const result = new Container();
     bindPreferenceService(result.bind.bind(result));
+
+    result.bind(ILogger).to(MockLogger).inSingletonScope();
+
     return result;
 }
 

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

@@ -21,9 +21,10 @@ import { JSONValue } from '@lumino/coreutils';
 import { IJSONSchema, JsonType } from '../../common/json-schema';
 import {
     DefaultsPreferenceProvider, Disposable, PreferenceDataProperty, PreferenceProvider,
-    PreferenceSchemaService, PreferenceSchemaServiceImpl, PreferenceScope
+    PreferenceSchemaService, PreferenceSchemaServiceImpl, PreferenceScope, ILogger
 } from '../../common';
 import { PreferenceLanguageOverrideService } from '../../common/preferences/preference-language-override-service';
+import { MockLogger } from '../../common/test/mock-logger';
 
 /* eslint-disable no-null/no-null */
 
@@ -35,6 +36,7 @@ describe('Preference Validation Service', () => {
     } as unknown as PreferenceSchemaService);
     container.bind(PreferenceLanguageOverrideService).to(PreferenceLanguageOverrideService).inSingletonScope();
     container.bind(PreferenceProvider).to(DefaultsPreferenceProvider).inSingletonScope().whenTargetNamed(PreferenceScope.Default);
+    container.bind(ILogger).to(MockLogger).inSingletonScope();
 
     const validator = container.resolve(PreferenceValidationService);
     const validateBySchema: (value: JSONValue, schema: PreferenceDataProperty) => JSONValue = validator.validateBySchema.bind(validator, 'dummy');

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

@@ -15,11 +15,12 @@
 // *****************************************************************************
 
 import { JSONObject, JSONValue } from '../../../shared/@lumino/coreutils';
-import { inject, injectable } from '../../../shared/inversify';
+import { inject, injectable, named } from '../../../shared/inversify';
 import { IJSONSchema, JsonType } from '../../common/json-schema';
 import { deepClone, unreachable } from '../../common';
 import { PreferenceLanguageOverrideService } from '../../common/preferences/preference-language-override-service';
 import { PreferenceSchemaService, PreferenceScope, PreferenceUtils, PreferenceDataProperty } from '../../common/preferences';
+import { ILogger } from '../../common/logger';
 
 export interface PreferenceValidator<T> {
     name: string;
@@ -40,6 +41,8 @@ type ValidatablePreferenceTuple = IJSONSchema & ({ items: IJSONSchema[] } | { pr
 export class PreferenceValidationService {
     @inject(PreferenceSchemaService) protected readonly schemaService: PreferenceSchemaService;
     @inject(PreferenceLanguageOverrideService) protected readonly languageOverrideService: PreferenceLanguageOverrideService;
+    @inject(ILogger) @named('core:PreferenceValidationService')
+    protected readonly logger: ILogger;
 
     validateOptions(options: Record<string, JSONValue>): Record<string, JSONValue> {
         const valid: Record<string, JSONValue> = {};
@@ -58,7 +61,7 @@ export class PreferenceValidationService {
         const validValue = this.doValidateByName(preferenceName, value);
         // If value is undefined, it means the preference wasn't set, not that a bad value was set.
         if (validValue !== value && value !== undefined) {
-            console.warn(`While validating options, found impermissible value for ${preferenceName}. Using valid value`, validValue, 'instead of configured value', value);
+            this.logger.warn(`While validating options, found impermissible value for ${preferenceName}. Using valid value`, validValue, 'instead of configured value', value);
         }
         return validValue;
     }
@@ -71,7 +74,7 @@ export class PreferenceValidationService {
     validateBySchema(key: string, value: JSONValue, schema: IJSONSchema | undefined): JSONValue {
         try {
             if (!schema) {
-                console.warn('Request to validate preference with no schema registered:', key);
+                this.logger.warn('Request to validate preference with no schema registered:', key);
                 return value;
             }
             if (schema.const !== undefined) {
@@ -87,7 +90,7 @@ export class PreferenceValidationService {
                 return this.validateOneOf(key, value, schema as IJSONSchema & { oneOf: IJSONSchema[] });
             }
             if (schema.type === undefined) {
-                console.warn('Request to validate preference with no type information:', key);
+                this.logger.warn('Request to validate preference with no type information:', key);
                 return value;
             }
             if (Array.isArray(schema.type)) {
@@ -112,7 +115,7 @@ export class PreferenceValidationService {
                     unreachable(schema.type, `Request to validate preference with unknown type in schema: ${key}`);
             }
         } catch (e) {
-            console.error('Encountered an error while validating', key, 'with value', value, 'against schema', schema, e);
+            this.logger.error('Encountered an error while validating', key, 'with value', value, 'against schema', schema, e);
             return value;
         }
     }
@@ -193,7 +196,7 @@ export class PreferenceValidationService {
             return [];
         }
         if (!schema.items && !schema.prefixItems) {
-            console.warn('Requested validation of array without item specification:', key);
+            this.logger.warn('Requested validation of array without item specification:', key);
             return candidate;
         }
         if (Array.isArray(schema.items) || Array.isArray(schema.prefixItems)) {

package/src/browser/secondary-window-handler.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import debounce = require('lodash.debounce');
-import { inject, injectable } from 'inversify';
+import { inject, injectable, named } from 'inversify';
 import { BoxLayout, ExtractableWidget, TabBar, Widget } from './widgets';
 import { MessageService } from '../common/message-service';
 import { ApplicationShell, DockPanelRenderer, MAIN_AREA_CLASS, MAIN_BOTTOM_AREA_CLASS } from './shell/application-shell';
@@ -23,6 +23,7 @@ import { Emitter } from '../common/event';
 import { isSecondaryWindow, SecondaryWindowRootWidget, SecondaryWindowService } from './window/secondary-window-service';
 import { KeybindingRegistry } from './keybinding';
 import { MAIN_AREA_ID, TheiaDockPanel } from './shell/theia-dock-panel';
+import { ILogger } from '../common/logger';
 import { nls } from '../common/nls';
 
 /** Widgets to be contained inside a DockPanel in the secondary window. */
@@ -104,6 +105,9 @@ export class SecondaryWindowHandler {
     @inject(TheiaDockPanel.Factory)
     protected dockPanelFactory: TheiaDockPanel.Factory;
 
+    @inject(ILogger) @named('core:SecondaryWindowHandler')
+    protected readonly logger: ILogger;
+
     protected readonly onWillAddWidgetEmitter = new Emitter<[Widget, Window]>();
     /** Subscribe to get notified when a widget is added to this handler, i.e. the widget was moved to an secondary window . */
     readonly onWillAddWidget = this.onWillAddWidgetEmitter.event;
@@ -157,11 +161,11 @@ export class SecondaryWindowHandler {
      */
     moveWidgetToSecondaryWindow(widget: ExtractableWidget): void {
         if (!this.applicationShell) {
-            console.error('Widget cannot be extracted because the WidgetExtractionHandler has not been initialized.');
+            this.logger.error('Widget cannot be extracted because the WidgetExtractionHandler has not been initialized.');
             return;
         }
         if (!widget.isExtractable) {
-            console.error('Widget is not extractable.', widget.id);
+            this.logger.error('Widget is not extractable.', widget.id);
             return;
         }
 
@@ -185,7 +189,7 @@ export class SecondaryWindowHandler {
 
             const element = newWindow.document.getElementById('widget-host');
             if (!element) {
-                console.error('Could not find dom element to attach to in secondary window');
+                this.logger.error('Could not find dom element to attach to in secondary window');
                 return;
             }
 
@@ -240,18 +244,18 @@ export class SecondaryWindowHandler {
     addWidgetToSecondaryWindow(widget: Widget, secondaryWindow: Window, options?: TheiaDockPanel.AddOptions): void {
         const rootWidget = isSecondaryWindow(secondaryWindow) ? secondaryWindow.rootWidget : undefined;
         if (!rootWidget) {
-            console.error('Given secondary window no known root.');
+            this.logger.error('Given secondary window no known root.');
             return;
         }
 
         // we allow to add any widget to an existing secondary window unless it is marked as not extractable or is already extracted
         if (ExtractableWidget.is(widget)) {
             if (!widget.isExtractable) {
-                console.error('Widget is not extractable.', widget.id);
+                this.logger.error('Widget is not extractable.', widget.id);
                 return;
             }
             if (widget.secondaryWindow !== undefined) {
-                console.error('Widget is extracted already.', widget.id);
+                this.logger.error('Widget is extracted already.', widget.id);
                 return;
             }
             widget.secondaryWindow = secondaryWindow;

package/src/browser/shell/application-shell.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject, optional, postConstruct } from 'inversify';
+import { injectable, inject, optional, postConstruct, named } from 'inversify';
 import { ArrayExt, find, toArray, each } from '@lumino/algorithm';
 import {
     BoxLayout, BoxPanel, DockLayout, DockPanel, FocusTracker, Layout, Panel, SplitLayout,
@@ -46,6 +46,7 @@ import { OpenerService } from '../opener-service';
 import { PreviewableWidget } from '../widgets/previewable-widget';
 import { WindowService } from '../window/window-service';
 import { TheiaSplitPanel } from './theia-split-panel';
+import { ILogger } from '../../common/logger';
 
 /** The class name added to ApplicationShell instances. */
 export const APPLICATION_SHELL_CLASS = 'theia-ApplicationShell';
@@ -242,6 +243,9 @@ export class ApplicationShell extends Widget {
     @inject(UntitledResourceResolver)
     protected readonly untitledResourceResolver: UntitledResourceResolver;
 
+    @inject(ILogger) @named('core:ApplicationShell')
+    protected readonly logger: ILogger;
+
     protected readonly onDidAddWidgetEmitter = new Emitter<Widget>();
     readonly onDidAddWidget = this.onDidAddWidgetEmitter.event;
     protected fireDidAddWidget(widget: Widget): void {
@@ -595,7 +599,7 @@ export class ApplicationShell extends Widget {
                 const opener = await this.openerService.getOpener(fileUri);
                 opener.open(fileUri);
             } catch (e) {
-                console.info(`no opener found for '${fileUri}'`);
+                this.logger.info(`no opener found for '${fileUri}'`);
             }
         };
 
@@ -975,7 +979,7 @@ export class ApplicationShell extends Widget {
      */
     async addWidget(widget: Widget, options?: Readonly<ApplicationShell.WidgetOptions>): Promise<void> {
         if (!widget.id) {
-            console.error('Widgets added to the application shell must have a unique id property.');
+            this.logger.error('Widgets added to the application shell must have a unique id property.');
             return;
         }
         const { area, addOptions } = this.getInsertionOptions(options);
@@ -1430,7 +1434,7 @@ export class ApplicationShell extends Widget {
             if (delta < this.activationTimeout) {
                 request = setTimeout(step, 0);
             } else {
-                console.warn(`Widget was activated, but did not accept focus after ${this.activationTimeout}ms: ${widget.id}`);
+                this.logger.warn(`Widget was activated, but did not accept focus after ${this.activationTimeout}ms: ${widget.id}`);
             }
         };
         let request = setTimeout(step, 0);

package/src/browser/tree/tree-container.spec.ts

@@ -19,6 +19,8 @@ import { Container } from 'inversify';
 import { createTreeContainer, isTreeServices } from './tree-container';
 import { TreeSearch } from './tree-search';
 import { defaultTreeProps, TreeProps } from './tree-widget';
+import { ILogger } from '../../common/logger';
+import { MockLogger } from '../../common/test/mock-logger';
 
 describe('TreeContainer', () => {
     describe('IsTreeServices should accurately distinguish TreeProps from TreeContainerProps', () => {
@@ -33,11 +35,15 @@ describe('TreeContainer', () => {
         const nonDefault = { search: !defaultTreeProps.search, contextMenu: ['no-default-for-this'] };
         it('should use props passed in as just props', () => {
             const parent = new Container();
+            parent.bind(ILogger).to(MockLogger).inSingletonScope();
+
             const child = createTreeContainer(parent, nonDefault);
             assert.deepStrictEqual(child.get(TreeProps), { ...defaultTreeProps, ...nonDefault });
         });
         it('should use props passed in as part of TreeContainerProps', () => {
             const parent = new Container();
+            parent.bind(ILogger).to(MockLogger).inSingletonScope();
+
             const child = createTreeContainer(parent, { props: nonDefault });
             assert.deepStrictEqual(child.get(TreeProps), { ...defaultTreeProps, ...nonDefault });
         });

package/src/browser/tree/tree.ts

@@ -14,13 +14,14 @@
 // 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 { Event, Emitter, WaitUntilEvent } from '../../common/event';
 import { Disposable, DisposableCollection } from '../../common/disposable';
 import { CancellationToken, CancellationTokenSource } from '../../common/cancellation';
 import { timeout } from '../../common/promise-util';
 import { isObject, Mutable } from '../../common';
 import { AccessibilityInformation } from '../../common/accessibility';
+import { ILogger } from '../../common/logger';
 
 export const Tree = Symbol('Tree');
 
@@ -250,6 +251,9 @@ export namespace CompositeTreeNode {
 @injectable()
 export class TreeImpl implements Tree {
 
+    @inject(ILogger) @named('core:TreeImpl')
+    protected readonly logger: ILogger;
+
     protected _root: TreeNode | undefined;
     protected readonly onChangedEmitter = new Emitter<void>();
     protected readonly onNodeRefreshedEmitter = new Emitter<CompositeTreeNode & WaitUntilEvent>();
@@ -344,7 +348,7 @@ export class TreeImpl implements Tree {
     protected async setChildren(parent: CompositeTreeNode, children: TreeNode[]): Promise<CompositeTreeNode | undefined> {
         const root = this.getRootNode(parent);
         if (this.nodes[root.id] && this.nodes[root.id] !== root) {
-            console.error(`Child node '${parent.id}' does not belong to this '${root.id}' tree.`);
+            this.logger.error(`Child node '${parent.id}' does not belong to this '${root.id}' tree.`);
             return undefined;
         }
         this.removeNode(parent);

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

@@ -15,11 +15,12 @@
 // *****************************************************************************
 
 import { Container } from 'inversify';
-import { ContributionProvider } from '../../common';
+import { ContributionProvider, ILogger } from '../../common';
 import { CorePreferences } from '../../common/core-preferences';
 import { FrontendApplicationContribution } from '../frontend-application-contribution';
 import { DefaultWindowService } from './default-window-service';
 import assert = require('assert');
+import { MockLogger } from '../../common/test/mock-logger';
 
 describe('DefaultWindowService', () => {
     class TestFrontendApplicationContribution implements FrontendApplicationContribution {
@@ -42,6 +43,7 @@ describe('DefaultWindowService', () => {
             .toConstantValue({
                 'application.confirmExit': confirmExit,
             });
+        container.bind(ILogger).to(MockLogger).inSingletonScope();
         return container.get(DefaultWindowService);
     }
     it('onWillStop should be called on every contribution (never)', () => {