@theia/plugin-ext 1.75.0-next.3 → 1.75.0-next.34

package/src/main/browser/comments/comments-service.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { URI } from '@theia/core/shared/vscode-uri';
 import { Event, Emitter } from '@theia/core/lib/common/event';
 import {
@@ -27,6 +27,7 @@ import {
 } from '../../../common/plugin-api-rpc-model';
 import { CommentController } from './comments-main';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
+import { ILogger } from '@theia/core';
 
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
@@ -90,6 +91,9 @@ export interface CommentsService {
 @injectable()
 export class PluginCommentService implements CommentsService {
 
+    @inject(ILogger) @named('plugin-ext:PluginCommentService')
+    protected readonly logger: ILogger;
+
     private readonly onDidSetDataProviderEmitter: Emitter<void> = new Emitter<void>();
     readonly onDidSetDataProvider: Event<void> = this.onDidSetDataProviderEmitter.event;
 
@@ -181,7 +185,7 @@ export class PluginCommentService implements CommentsService {
         this.commentControls.forEach(control => {
             commentControlResult.push(control.getDocumentComments(resource, CancellationToken.None)
                 .catch(e => {
-                    console.log(e);
+                    this.logger.info(e);
                     return null;
                 }));
         });

package/src/main/browser/custom-editors/plugin-custom-editor-registry.ts

@@ -14,12 +14,12 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
 import { CustomEditor, DeployedPlugin } from '../../../common';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { CustomEditorOpener } from './custom-editor-opener';
-import { Emitter, PreferenceService } from '@theia/core';
+import { Emitter, PreferenceService, ILogger } from '@theia/core';
 import { ApplicationShell, DefaultOpenerService, OpenWithService, WidgetManager } from '@theia/core/lib/browser';
 import { CustomEditorWidget } from './custom-editor-widget';
 
@@ -47,6 +47,9 @@ export class PluginCustomEditorRegistry {
     @inject(PreferenceService)
     protected readonly preferenceService: PreferenceService;
 
+    @inject(ILogger) @named('plugin-ext:PluginCustomEditorRegistry')
+    protected readonly logger: ILogger;
+
     @postConstruct()
     protected init(): void {
         this.widgetManager.onDidCreateWidget(({ factoryId, widget }) => {
@@ -67,7 +70,7 @@ export class PluginCustomEditorRegistry {
 
     registerCustomEditor(editor: CustomEditor, plugin: DeployedPlugin): Disposable {
         if (this.editors.has(editor.viewType)) {
-            console.warn('editor with such id already registered: ', JSON.stringify(editor));
+            this.logger.warn('editor with such id already registered: ', JSON.stringify(editor));
             return Disposable.NULL;
         }
         this.editors.set(editor.viewType, editor);

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

@@ -18,6 +18,7 @@ import { DebugSessionContributionRegistry, DebugSessionContribution } from '@the
 import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify';
 import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
 import { Disposable } from '@theia/core/lib/common/disposable';
+import { ILogger } from '@theia/core';
 
 /**
  * Debug session contribution registrator.
@@ -47,6 +48,9 @@ export class PluginDebugSessionContributionRegistry implements DebugSessionContr
     @inject(ContributionProvider) @named(DebugSessionContribution)
     protected readonly contributions: ContributionProvider<DebugSessionContribution>;
 
+    @inject(ILogger) @named('plugin-ext:PluginDebugSessionContributionRegistry')
+    protected readonly logger: ILogger;
+
     @postConstruct()
     protected init(): void {
         for (const contrib of this.contributions.getContributions()) {
@@ -62,7 +66,7 @@ export class PluginDebugSessionContributionRegistry implements DebugSessionContr
         const { debugType } = contrib;
 
         if (this.contribs.has(debugType)) {
-            console.warn(`Debug session contribution already registered for ${debugType}`);
+            this.logger.warn(`Debug session contribution already registered for ${debugType}`);
             return Disposable.NULL;
         }
 

package/src/main/browser/menus/menus-contribution-handler.ts

@@ -16,8 +16,8 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { inject, injectable, optional } from '@theia/core/shared/inversify';
-import { MenuPath, CommandRegistry, Disposable, DisposableCollection, nls, CommandMenu, AcceleratorSource, ContextExpressionMatcher, environment } from '@theia/core';
+import { inject, injectable, optional, named } from '@theia/core/shared/inversify';
+import { MenuPath, CommandRegistry, Disposable, DisposableCollection, nls, CommandMenu, AcceleratorSource, ContextExpressionMatcher, environment, ILogger } from '@theia/core';
 import { MenuModelRegistry } from '@theia/core/lib/common';
 import { TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { DeployedPlugin, IconUrl, Menu } from '../../../common';
@@ -48,6 +48,9 @@ export class MenusContributionPointHandler {
     @inject(QuickCommandService) @optional()
     private readonly quickCommandService: QuickCommandService;
 
+    @inject(ILogger) @named('plugin-ext:MenusContributionPointHandler')
+    protected readonly logger: ILogger;
+
     private initialized = false;
     private initialize(): void {
         this.initialized = true;
@@ -100,7 +103,7 @@ export class MenusContributionPointHandler {
                         const { group, order } = this.parseGroup(item.group);
                         const { submenu, command } = item;
                         if (submenu && command) {
-                            console.warn(
+                            this.logger.warn(
                                 `Menu item ${command} from plugin ${plugin.metadata.model.id} contributed both submenu and command. Only command will be registered.`
                             );
                         }
@@ -111,7 +114,7 @@ export class MenusContributionPointHandler {
 
                                 const cmd = this.commandRegistry.getCommand(command);
                                 if (!cmd) {
-                                    console.debug(`No label for action menu node: No command "${command}" exists.`);
+                                    this.logger.debug(`No label for action menu node: No command "${command}" exists.`);
                                     return;
                                 }
                                 const label = cmd.label || cmd.id;
@@ -159,8 +162,8 @@ export class MenusContributionPointHandler {
                         }
                     }
                 } catch (error) {
-                    console.warn(`Failed to register a menu item for plugin ${plugin.metadata.model.id} contributed to ${contributionPoint}`, item);
-                    console.debug(error);
+                    this.logger.warn(`Failed to register a menu item for plugin ${plugin.metadata.model.id} contributed to ${contributionPoint}`, item);
+                    this.logger.debug(error);
                 }
             }
         }

package/src/main/browser/plugin-contribution-handler.ts

@@ -277,7 +277,7 @@ export class PluginContributionHandler {
                         embeddedLanguages: this.convertEmbeddedLanguages(grammar.embeddedLanguages, logWarning),
                         tokenTypes: this.convertTokenTypes(grammar.tokenTypes),
                         balancedBracketSelectors: grammar.balancedBracketScopes ?? ['*'],
-                        unbalancedBracketSelectors: grammar.balancedBracketScopes,
+                        unbalancedBracketSelectors: grammar.unbalancedBracketScopes ?? [],
                     }));
                 }
                 // activate grammars only once everything else is loaded.

package/src/main/browser/plugin-icon-service.ts

@@ -21,6 +21,7 @@ import { URI } from '@theia/core/shared/vscode-uri';
 import { MonacoIconRegistry } from '@theia/monaco/lib/browser/monaco-icon-registry';
 import * as path from 'path';
 import { IconContribution, DeployedPlugin, IconDefinition } from '../../common/plugin-protocol';
+import { PLUGINS_BASE_PATH } from '@theia/plugin-utils/lib/common/constants';
 
 @injectable()
 export class PluginIconService implements Disposable {
@@ -68,7 +69,7 @@ export class PluginIconService implements Disposable {
 
     protected toPluginUrl(id: string, relativePath: string): URI {
         return URI.from(new Endpoint({
-            path: `hostedPlugin/${this.formatExtensionId(id)}/${encodeURIComponent(relativePath)}`
+            path: `${PLUGINS_BASE_PATH}/${this.formatExtensionId(id)}/${encodeURIComponent(relativePath)}`
         }).getRestUrl().toComponents());
     }
 

package/src/main/browser/plugin-icon-theme-service.ts

@@ -25,6 +25,7 @@ import * as jsoncparser from 'jsonc-parser';
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import { IconThemeService, IconTheme, IconThemeDefinition } from '@theia/core/lib/browser/icon-theme-service';
 import { IconThemeContribution, DeployedPlugin, UiTheme, getPluginId } from '../../common/plugin-protocol';
+import { PLUGINS_BASE_PATH } from '@theia/plugin-utils/lib/common/constants';
 import URI from '@theia/core/lib/common/uri';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Emitter } from '@theia/core/lib/common/event';
@@ -363,7 +364,7 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
         const iconUri = this.locationUri.resolve(iconPath);
         const relativePath = this.packageRootUri.path.relative(iconUri.path.normalize());
         return relativePath && `url('${new Endpoint({
-            path: `hostedPlugin/${this.pluginId}/${encodeURIComponent(relativePath.normalize().toString())}`
+            path: `${PLUGINS_BASE_PATH}/${this.pluginId}/${encodeURIComponent(relativePath.normalize().toString())}`
         }).getRestUrl().toString()}')`;
     }
 

package/src/main/browser/plugin-shared-style.ts

@@ -21,6 +21,7 @@ import { Theme } from '@theia/core/lib/common/theme';
 import { IconUrl } from '../../common/plugin-protocol';
 import { Reference, SyncReferenceCollection } from '@theia/core/lib/common/reference';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';
+import { PLUGINS_BASE_PATH } from '@theia/plugin-utils/lib/common/constants';
 
 export interface PluginIconKey {
     url: IconUrl;
@@ -145,7 +146,7 @@ export class PluginSharedStyle {
     }
 
     static toExternalIconUrl(iconUrl: string): string {
-        if (iconUrl.startsWith('hostedPlugin/')) {
+        if (iconUrl.startsWith(`${PLUGINS_BASE_PATH}/`)) {
             return new Endpoint({ path: iconUrl }).getRestUrl().toString();
         }
         return iconUrl;

package/src/main/browser/scm-main.ts

@@ -138,7 +138,9 @@ function historyItemFromDto(dto: ScmHistoryItemDto): ScmHistoryItem {
             'light' in dto.authorIcon ? vscodeURI.revive(dto.authorIcon.light).toString() : vscodeURI.revive(dto.authorIcon as UriComponents).toString()) : undefined,
         displayId: dto.displayId,
         timestamp: dto.timestamp,
-        tooltip: typeof dto.tooltip === 'string' ? dto.tooltip : dto.tooltip?.value,
+        // Passed through as-is so that the provider's own links, commands and `isTrusted`
+        // declaration survive; flattening to `value` would strip the command allow-list.
+        tooltip: dto.tooltip,
         statistics: dto.statistics ? {
             files: dto.statistics.files,
             insertions: dto.statistics.insertions,

package/src/main/browser/text-editor-model-service.ts

@@ -13,9 +13,9 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-import { Event, Emitter, ListenerList, Listener } from '@theia/core';
+import { Event, Emitter, ListenerList, Listener, ILogger } from '@theia/core';
 import { MonacoEditorModel, WillSaveMonacoModelEvent } from '@theia/monaco/lib/browser/monaco-editor-model';
-import { injectable, inject } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
 import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
 import { Schemes } from '../../common/uri-components';
@@ -40,6 +40,9 @@ export class EditorModelService {
     readonly onModelModeChanged = this.modelModeChangedEmitter.event;
     readonly onModelRemoved = this.onModelRemovedEmitter.event;
 
+    @inject(ILogger) @named('plugin-ext:EditorModelService')
+    protected readonly logger: ILogger;
+
     constructor(@inject(MonacoTextModelService) monacoModelService: MonacoTextModelService,
         @inject(MonacoWorkspace) monacoWorkspace: MonacoWorkspace) {
 
@@ -102,7 +105,7 @@ export class EditorModelService {
                         await model.save();
                         return true;
                     } catch (e) {
-                        console.error('Failed to save ', uri.toString(), e);
+                        this.logger.error('Failed to save ', uri.toString(), e);
                         return false;
                     }
                 })());

package/src/main/browser/view/plugin-view-registry.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject, postConstruct, optional } from '@theia/core/shared/inversify';
+import { injectable, inject, postConstruct, optional, named } from '@theia/core/shared/inversify';
 import {
     ApplicationShell, ViewContainer as ViewContainerWidget, WidgetManager, QuickViewService,
     ViewContainerIdentifier, ViewContainerTitleOptions, Widget, FrontendApplicationContribution,
@@ -47,7 +47,7 @@ import { WebviewView, WebviewViewResolver } from '../webview-views/webview-views
 import { WebviewWidget, WebviewWidgetIdentifier } from '../webview/webview';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
 import { generateUuid } from '@theia/core/lib/common/uuid';
-import { nls } from '@theia/core';
+import { nls, ILogger } from '@theia/core';
 import { TheiaDockPanel } from '@theia/core/lib/browser/shell/theia-dock-panel';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
@@ -102,6 +102,9 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
     @inject(ViewContextKeyService)
     protected readonly viewContextKeys: ViewContextKeyService;
 
+    @inject(ILogger) @named('plugin-ext:PluginViewRegistry')
+    protected readonly logger: ILogger;
+
     protected readonly onDidExpandViewEmitter = new Emitter<string>();
     readonly onDidExpandView = this.onDidExpandViewEmitter.event;
 
@@ -312,7 +315,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
     registerViewContainer(location: string, viewContainer: ViewContainer): Disposable {
         const containerId = `workbench.view.extension.${viewContainer.id}`;
         if (this.viewContainers.has(containerId)) {
-            console.warn('view container such id already registered: ', JSON.stringify(viewContainer));
+            this.logger.warn('view container such id already registered: ', JSON.stringify(viewContainer));
             return Disposable.NULL;
         }
         const toDispose = new DisposableCollection();
@@ -521,7 +524,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
             viewContainerId = `workbench.view.extension.${viewContainerId}`;
         }
         if (this.views.has(view.id)) {
-            console.warn('view with such id already registered: ', JSON.stringify(view));
+            this.logger.warn('view with such id already registered: ', JSON.stringify(view));
             return Disposable.NULL;
         }
         const toDispose = new DisposableCollection();
@@ -922,39 +925,39 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         for (const id of this.viewContainers.keys()) {
             promises.push((async () => {
                 await this.initViewContainer(id);
-            })().catch(console.error));
+            })().catch(e => this.logger.error(e)));
         }
         promises.push((async () => {
             const explorer = await this.widgetManager.getWidget(EXPLORER_VIEW_CONTAINER_ID);
             if (explorer instanceof ViewContainerWidget) {
                 await this.prepareViewContainer('explorer', explorer);
             }
-        })().catch(console.error));
+        })().catch(e => this.logger.error(e)));
         promises.push((async () => {
             const scm = await this.widgetManager.getWidget(SCM_VIEW_CONTAINER_ID);
             if (scm instanceof ViewContainerWidget) {
                 await this.prepareViewContainer('scm', scm);
             }
-        })().catch(console.error));
+        })().catch(e => this.logger.error(e)));
         promises.push((async () => {
             const search = await this.widgetManager.getWidget(SEARCH_VIEW_CONTAINER_ID);
             if (search instanceof ViewContainerWidget) {
                 await this.prepareViewContainer('search', search);
             }
-        })().catch(console.error));
+        })().catch(e => this.logger.error(e)));
         promises.push((async () => {
             const test = await this.widgetManager.getWidget(TEST_VIEW_CONTAINER_ID);
             if (test instanceof ViewContainerWidget) {
                 await this.prepareViewContainer('test', test);
             }
-        })().catch(console.error));
+        })().catch(e => this.logger.error(e)));
         promises.push((async () => {
             const debug = await this.widgetManager.getWidget(DebugWidget.ID);
             if (debug instanceof DebugWidget) {
                 const viewContainer = debug['sessionWidget']['viewContainer'];
                 await this.prepareViewContainer('debug', viewContainer);
             }
-        })().catch(console.error));
+        })().catch(e => this.logger.error(e)));
         await Promise.all(promises);
     }
 
@@ -1016,7 +1019,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
 
     registerViewDataProvider(viewId: string, provider: ViewDataProvider): Disposable {
         if (this.viewDataProviders.has(viewId)) {
-            console.error(`data provider for '${viewId}' view is already registered`);
+            this.logger.error(`data provider for '${viewId}' view is already registered`);
             return Disposable.NULL;
         }
         this.viewDataProviders.set(viewId, provider);

package/src/main/browser/view/tree-view-widget.tsx

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
 import { TreeViewsExt, TreeViewItemCollapsibleState, TreeViewItem, TreeViewItemReference, ThemeIcon, DataTransferFileDTO } from '../../../common/plugin-api-rpc';
 import { Command } from '../../../common/plugin-api-rpc-model';
 import {
@@ -53,6 +53,7 @@ import { CancellationTokenSource, CancellationToken, Mutable } from '@theia/core
 import { mixin } from '../../../common/types';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { DnDFileContentStore } from './dnd-file-content-store';
+import { ILogger } from '@theia/core';
 
 export const TREE_NODE_HYPERLINK = 'theia-TreeNodeHyperlink';
 export const VIEW_ITEM_CONTEXT_MENU: MenuPath = ['view-item-context-menu'];
@@ -183,6 +184,9 @@ export class PluginTree extends TreeImpl {
     @inject(MessageService)
     protected readonly notification: MessageService;
 
+    @inject(ILogger) @named('plugin-ext:PluginTree')
+    protected override readonly logger: ILogger;
+
     protected readonly onDidChangeWelcomeStateEmitter: Emitter<void> = new Emitter<void>();
     readonly onDidChangeWelcomeState = this.onDidChangeWelcomeStateEmitter.event;
 
@@ -235,7 +239,7 @@ export class PluginTree extends TreeImpl {
             return children || [];
         } catch (e) {
             if (e) {
-                console.error(`Failed to fetch children for '${this.options.id}'`, e);
+                this.logger.error(`Failed to fetch children for '${this.options.id}'`, e);
                 const label = this._viewInfo ? this._viewInfo.name : this.options.id;
                 this.notification.error(`${label}: ${e.message}`);
             }
@@ -473,6 +477,9 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     @inject(DnDFileContentStore)
     protected readonly dndFileContentStore: DnDFileContentStore;
 
+    @inject(ILogger) @named('plugin-ext:TreeViewWidget')
+    protected readonly logger: ILogger;
+
     protected treeDragType: string;
     protected readonly expansionTimeouts: Map<string, number> = new Map();
 
@@ -633,17 +640,17 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     handleDragLeave(node: TreeViewNode, event: React.DragEvent<HTMLElement>): void {
         const timeout = this.expansionTimeouts.get(node.id);
         if (typeof timeout !== 'undefined') {
-            console.debug(`dragleave ${node.id} canceling timeout`);
+            this.logger.debug(`dragleave ${node.id} canceling timeout`);
             clearTimeout(timeout);
             this.expansionTimeouts.delete(node.id);
         }
     }
     handleDragEnter(node: TreeViewNode, event: React.DragEvent<HTMLElement>): void {
-        console.debug(`dragenter ${node.id}`);
+        this.logger.debug(`dragenter ${node.id}`);
         if (ExpandableTreeNode.is(node)) {
-            console.debug(`dragenter ${node.id} starting timeout`);
+            this.logger.debug(`dragenter ${node.id} starting timeout`);
             this.expansionTimeouts.set(node.id, window.setTimeout(() => {
-                console.debug(`dragenter ${node.id} timeout reached`);
+                this.logger.debug(`dragenter ${node.id} timeout reached`);
                 this.model.expandNode(node);
             }, 500));
         }
@@ -870,7 +877,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
             const allResolved = Promise.all(treeNodes.map(maybeNeedsResolve => {
                 if (!maybeNeedsResolve.command && maybeNeedsResolve instanceof ResolvableTreeViewNode && !maybeNeedsResolve.resolved) {
                     return maybeNeedsResolve.resolve(cancellationToken).catch(err => {
-                        console.error(`Failed to resolve tree item '${maybeNeedsResolve.id}'`, err);
+                        this.logger.error(`Failed to resolve tree item '${maybeNeedsResolve.id}'`, err);
                     });
                 }
                 return Promise.resolve(maybeNeedsResolve);

package/src/main/browser/webview/webview.ts

@@ -477,10 +477,12 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
 
     protected forwardConsoleLog(log: WebviewConsoleLog): void {
         const message = `[webview: ${this.identifier.id}] ${log.message ? JSON.parse(log.message) : undefined}`;
+        // `console.log` has no direct `ILogger` counterpart, so it is reported as `info`.
+        const level = log.level === 'log' ? 'info' : log.level;
         if (log.optionalParams !== undefined) {
-            console[log.level](message, ...JSON.parse(log.optionalParams));
+            this.logger[level](message, ...JSON.parse(log.optionalParams));
         } else {
-            console[log.level](message);
+            this.logger[level](message);
         }
     }
 

package/src/main/browser/webview-views/webview-views-main.ts

@@ -19,7 +19,7 @@
  *--------------------------------------------------------------------------------------------*/
 // some code copied and modified from https://github.com/microsoft/vscode/blob/e1f0f8f51390dea5df9096718fb6b647ed5a9534/src/vs/workbench/api/browser/mainThreadWebviewViews.ts
 
-import { inject, interfaces } from '@theia/core/shared/inversify';
+import { inject, interfaces, named } from '@theia/core/shared/inversify';
 import { WebviewViewsMain, MAIN_RPC_CONTEXT, WebviewViewsExt } from '../../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../../common/rpc-protocol';
 import { Disposable, DisposableCollection, ILogger } from '@theia/core';
@@ -44,7 +44,7 @@ export class WebviewViewsMainImpl implements WebviewViewsMain, Disposable {
     protected readonly pluginViewRegistry: PluginViewRegistry;
     protected readonly badgeService: BadgeService;
 
-    @inject(ILogger)
+    @inject(ILogger) @named('plugin-ext:WebviewViewsMainImpl')
     protected readonly logger: ILogger;
 
     constructor(rpc: RPCProtocol,
@@ -77,9 +77,9 @@ export class WebviewViewsMainImpl implements WebviewViewsMain, Disposable {
                 if (webviewView.webview.state) {
                     try {
                         state = JSON.parse(webviewView.webview.state);
-                        console.log(state);
+                        this.logger.info(state);
                     } catch (e) {
-                        console.error('Could not load webview state', e, webviewView.webview.state);
+                        this.logger.error('Could not load webview state', e, webviewView.webview.state);
                     }
                 }
                 if (options) {

package/src/main/node/handlers/plugin-theia-directory-handler.ts

@@ -17,8 +17,8 @@
 import * as path from 'path';
 import * as filenamify from 'filenamify';
 import * as fs from '@theia/core/shared/fs-extra';
-import type { URI } from '@theia/core';
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { URI, ILogger } from '@theia/core';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { FileUri } from '@theia/core/lib/node';
 import {
@@ -34,6 +34,9 @@ export abstract class AbstractPluginDirectoryHandler implements PluginDeployerDi
 
     @inject(PluginCliContribution) protected readonly pluginCli: PluginCliContribution;
 
+    @inject(ILogger) @named('plugin-ext:AbstractPluginDirectoryHandler')
+    protected readonly logger: ILogger;
+
     constructor() {
         this.deploymentDirectory = new Deferred();
         getTempDirPathAsync('theia-copied')
@@ -42,7 +45,7 @@ export abstract class AbstractPluginDirectoryHandler implements PluginDeployerDi
 
     async accept(resolvedPlugin: PluginDeployerEntry): Promise<boolean> {
 
-        console.debug(`Plugin directory handler: accepting plugin with path ${resolvedPlugin.path()}`);
+        this.logger.debug(`Plugin directory handler: accepting plugin with path ${resolvedPlugin.path()}`);
 
         // handle only directories
         if (await resolvedPlugin.isFile()) {
@@ -89,9 +92,9 @@ export abstract class AbstractPluginDirectoryHandler implements PluginDeployerDi
             const targetDir = await this.getExtensionDir(context);
             try {
                 if (await fs.pathExists(targetDir) || !entry.path().startsWith(origin)) {
-                    console.log(`[${id}]: already copied.`);
+                    this.logger.info(`[${id}]: already copied.`);
                 } else {
-                    console.log(`[${id}]: copying to "${targetDir}"`);
+                    this.logger.info(`[${id}]: copying to "${targetDir}"`);
                     const deploymentDirectory = await this.deploymentDirectory.promise;
                     await fs.mkdirp(FileUri.fsPath(deploymentDirectory));
                     await context.copy(origin, targetDir);
@@ -101,7 +104,7 @@ export abstract class AbstractPluginDirectoryHandler implements PluginDeployerDi
                     }
                 }
             } catch (e) {
-                console.warn(`[${id}]: Error when copying.`, e);
+                this.logger.warn(`[${id}]: Error when copying.`, e);
                 entry.updatePath(pathToRestore);
             }
         }

package/src/main/node/handlers/plugin-theia-file-handler.ts

@@ -15,8 +15,8 @@
 // *****************************************************************************
 
 import { PluginDeployerFileHandler, PluginDeployerEntry, PluginDeployerFileHandlerContext, PluginType } from '../../../common/plugin-protocol';
-import type { URI } from '@theia/core';
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { URI, ILogger } from '@theia/core';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { getTempDirPathAsync } from '../temp-dir-util';
 import * as fs from '@theia/core/shared/fs-extra';
@@ -32,6 +32,9 @@ export class PluginTheiaFileHandler implements PluginDeployerFileHandler {
     @inject(PluginTheiaEnvironment)
     protected readonly environment: PluginTheiaEnvironment;
 
+    @inject(ILogger) @named('plugin-ext:PluginTheiaFileHandler')
+    protected readonly logger: ILogger;
+
     constructor() {
         this.systemPluginsDirUri = new Deferred();
         getTempDirPathAsync('theia-unpacked')
@@ -48,14 +51,14 @@ export class PluginTheiaFileHandler implements PluginDeployerFileHandler {
     async handle(context: PluginDeployerFileHandlerContext): Promise<void> {
         const id = context.pluginEntry().id();
         const pluginDir = await this.getPluginDir(context);
-        console.log(`[${id}]: trying to decompress into "${pluginDir}"...`);
+        this.logger.info(`[${id}]: trying to decompress into "${pluginDir}"...`);
         if (context.pluginEntry().type === PluginType.User && await fs.pathExists(pluginDir)) {
-            console.log(`[${id}]: already found`);
+            this.logger.info(`[${id}]: already found`);
             context.pluginEntry().updatePath(pluginDir);
             return;
         }
         await context.unzip(context.pluginEntry().path(), pluginDir);
-        console.log(`[${id}]: decompressed`);
+        this.logger.info(`[${id}]: decompressed`);
         context.pluginEntry().updatePath(pluginDir);
     }
 

package/src/main/node/paths/plugin-paths-service.ts

@@ -14,7 +14,7 @@
 // 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 URI from '@theia/core/lib/common/uri';
 import * as path from 'path';
 import * as fs from '@theia/core/shared/fs-extra';
@@ -35,7 +35,7 @@ const SESSION_TIMESTAMP_PATTERN = /^\d{8}T\d{6}$/;
 @injectable()
 export class PluginPathsServiceImpl implements PluginPathsService {
 
-    @inject(ILogger)
+    @inject(ILogger) @named('plugin-ext:PluginPathsServiceImpl')
     protected readonly logger: ILogger;
 
     @inject(EnvVariablesServer)

package/src/main/node/plugin-deployer-contribution.ts

@@ -15,14 +15,14 @@
 // *****************************************************************************
 
 import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { injectable, inject } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { PluginDeployer } from '../../common/plugin-protocol';
 import { ILogger } from '@theia/core';
 
 @injectable()
 export class PluginDeployerContribution implements BackendApplicationContribution {
 
-    @inject(ILogger)
+    @inject(ILogger) @named('plugin-ext:PluginDeployerContribution')
     protected readonly logger: ILogger;
 
     @inject(PluginDeployer)