@theia/plugin-ext 1.73.0-next.3 → 1.73.0-next.31

package/src/hosted/node/scanners/scanner-theia.ts

@@ -16,7 +16,7 @@
 
 /* eslint-disable @theia/localization-check */
 
-import { inject, injectable, unmanaged } from '@theia/core/shared/inversify';
+import { inject, injectable, unmanaged, named } from '@theia/core/shared/inversify';
 import {
     AutoClosingPair,
     AutoClosingPairConditional,
@@ -82,10 +82,19 @@ import { ColorDefinition } from '@theia/core/lib/common/color';
 import { CSSIcon } from '@theia/core/lib/common/markdown-rendering/icon-utilities';
 import { PluginUriFactory } from './plugin-uri-factory';
 import { PreferenceScope } from '@theia/core/lib/common/preferences/preference-scope';
+import { ILogger } from '@theia/core';
 
 const colorIdPattern = '^\\w+[.\\w+]*$';
 const iconIdPattern = `^${CSSIcon.iconNameSegment}(-${CSSIcon.iconNameSegment})+$`;
 
+/** Maps the view container locations used by VS Code extensions to the Theia shell locations. */
+const VIEW_CONTAINER_LOCATION_ALIASES: Record<string, string> = {
+    activitybar: 'left',
+    panel: 'bottom',
+    secondarySidebar: 'right',
+    auxiliarybar: 'right'
+};
+
 function getFileExtension(filePath: string): string {
     const index = filePath.lastIndexOf('.');
     return index === -1 ? '' : filePath.substring(index + 1);
@@ -276,6 +285,9 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
         super('theiaPlugin', 'backend-init-theia');
     }
 
+    @inject(ILogger) @named('plugin-ext:TheiaPluginScanner')
+    protected readonly logger: ILogger;
+
     protected getEntryPoint(plugin: PluginPackage): PluginEntryPoint {
         const result: PluginEntryPoint = {
             frontend: plugin.theiaPlugin!.frontend,
@@ -327,7 +339,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 }
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'configuration'.`, rawPlugin.contributes.configuration, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'configuration'.`, rawPlugin.contributes.configuration, err);
         }
 
         const configurationDefaults = rawPlugin.contributes.configurationDefaults;
@@ -338,7 +350,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 contributions.submenus = this.readSubmenus(rawPlugin.contributes.submenus, rawPlugin);
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'submenus'.`, rawPlugin.contributes.submenus, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'submenus'.`, rawPlugin.contributes.submenus, err);
         }
 
         try {
@@ -347,7 +359,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 contributions.customEditors = customEditors;
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'customEditors'.`, rawPlugin.contributes.customEditors, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'customEditors'.`, rawPlugin.contributes.customEditors, err);
         }
 
         try {
@@ -357,7 +369,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
 
                 for (const location of Object.keys(viewsContainers)) {
                     const containers = this.readViewsContainers(viewsContainers[location], rawPlugin);
-                    const loc = location === 'activitybar' ? 'left' : location === 'panel' ? 'bottom' : location;
+                    const loc = VIEW_CONTAINER_LOCATION_ALIASES[location] ?? location;
                     if (contributions.viewsContainers[loc]) {
                         contributions.viewsContainers[loc] = contributions.viewsContainers[loc].concat(containers);
                     } else {
@@ -366,7 +378,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 }
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'viewsContainers'.`, rawPlugin.contributes.viewsContainers, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'viewsContainers'.`, rawPlugin.contributes.viewsContainers, err);
         }
 
         try {
@@ -379,7 +391,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 }
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'views'.`, rawPlugin.contributes.views, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'views'.`, rawPlugin.contributes.views, err);
         }
 
         try {
@@ -387,7 +399,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 contributions.viewsWelcome = this.readViewsWelcome(rawPlugin.contributes!.viewsWelcome, rawPlugin.contributes.views);
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'viewsWelcome'.`, rawPlugin.contributes.viewsWelcome, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'viewsWelcome'.`, rawPlugin.contributes.viewsWelcome, err);
         }
 
         try {
@@ -397,7 +409,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 contributions.commands = commands.map(command => this.readCommand(command, rawPlugin));
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'commands'.`, rawPlugin.contributes!.commands, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'commands'.`, rawPlugin.contributes!.commands, err);
         }
 
         try {
@@ -410,7 +422,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 }
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'menus'.`, rawPlugin.contributes.menus, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'menus'.`, rawPlugin.contributes.menus, err);
         }
 
         try {
@@ -419,7 +431,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 contributions.keybindings = rawKeybindings.map(rawKeybinding => this.readKeybinding(rawKeybinding));
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'keybindings'.`, rawPlugin.contributes.keybindings, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'keybindings'.`, rawPlugin.contributes.keybindings, err);
         }
 
         try {
@@ -428,7 +440,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 contributions.debuggers = debuggers;
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'debuggers'.`, rawPlugin.contributes.debuggers, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'debuggers'.`, rawPlugin.contributes.debuggers, err);
         }
 
         try {
@@ -437,91 +449,91 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 contributions.taskDefinitions = definitions.map(definitionContribution => this.readTaskDefinition(rawPlugin.name, definitionContribution));
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'taskDefinitions'.`, rawPlugin.contributes.taskDefinitions, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'taskDefinitions'.`, rawPlugin.contributes.taskDefinitions, err);
         }
 
         try {
             contributions.problemMatchers = rawPlugin.contributes.problemMatchers;
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'problemMatchers'.`, rawPlugin.contributes.problemMatchers, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'problemMatchers'.`, rawPlugin.contributes.problemMatchers, err);
         }
 
         try {
             contributions.problemPatterns = rawPlugin.contributes.problemPatterns;
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'problemPatterns'.`, rawPlugin.contributes.problemPatterns, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'problemPatterns'.`, rawPlugin.contributes.problemPatterns, err);
         }
 
         try {
             contributions.resourceLabelFormatters = rawPlugin.contributes.resourceLabelFormatters;
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'resourceLabelFormatters'.`, rawPlugin.contributes.resourceLabelFormatters, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'resourceLabelFormatters'.`, rawPlugin.contributes.resourceLabelFormatters, err);
         }
 
         try {
             contributions.authentication = rawPlugin.contributes.authentication;
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'authentication'.`, rawPlugin.contributes.authentication, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'authentication'.`, rawPlugin.contributes.authentication, err);
         }
 
         try {
             contributions.notebooks = rawPlugin.contributes.notebooks;
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'notebooks'.`, rawPlugin.contributes.notebooks, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'notebooks'.`, rawPlugin.contributes.notebooks, err);
         }
 
         try {
             contributions.notebookRenderer = rawPlugin.contributes.notebookRenderer;
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'notebook-renderer'.`, rawPlugin.contributes.notebookRenderer, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'notebook-renderer'.`, rawPlugin.contributes.notebookRenderer, err);
         }
 
         try {
             contributions.notebookPreload = rawPlugin.contributes.notebookPreload;
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'notebooks-preload'.`, rawPlugin.contributes.notebookPreload, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'notebooks-preload'.`, rawPlugin.contributes.notebookPreload, err);
         }
 
         try {
             contributions.snippets = this.readSnippets(rawPlugin);
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'snippets'.`, rawPlugin.contributes!.snippets, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'snippets'.`, rawPlugin.contributes!.snippets, err);
         }
 
         try {
             contributions.themes = this.readThemes(rawPlugin);
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'themes'.`, rawPlugin.contributes.themes, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'themes'.`, rawPlugin.contributes.themes, err);
         }
 
         try {
             contributions.icons = this.readIcons(rawPlugin);
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'icons'.`, rawPlugin.contributes.icons, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'icons'.`, rawPlugin.contributes.icons, err);
         }
 
         try {
             contributions.iconThemes = this.readIconThemes(rawPlugin);
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'iconThemes'.`, rawPlugin.contributes.iconThemes, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'iconThemes'.`, rawPlugin.contributes.iconThemes, err);
         }
 
         try {
             contributions.colors = this.readColors(rawPlugin);
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'colors'.`, rawPlugin.contributes.colors, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'colors'.`, rawPlugin.contributes.colors, err);
         }
 
         try {
             contributions.terminalProfiles = this.readTerminals(rawPlugin);
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'terminals'.`, rawPlugin.contributes.terminal, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'terminals'.`, rawPlugin.contributes.terminal, err);
         }
 
         try {
             contributions.localizations = this.readLocalizations(rawPlugin);
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'localizations'.`, rawPlugin.contributes.localizations, err);
+            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'localizations'.`, rawPlugin.contributes.localizations, err);
         }
 
         const [languagesResult, grammarsResult] = await Promise.allSettled([
@@ -533,7 +545,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
             if (languagesResult.status === 'fulfilled') {
                 contributions.languages = languagesResult.value;
             } else {
-                console.error(`Could not read '${rawPlugin.name}' contribution 'languages'.`, rawPlugin.contributes.languages, languagesResult.reason);
+                this.logger.error(`Could not read '${rawPlugin.name}' contribution 'languages'.`, rawPlugin.contributes.languages, languagesResult.reason);
             }
         }
 
@@ -541,7 +553,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
             if (grammarsResult.status === 'fulfilled') {
                 contributions.grammars = grammarsResult.value;
             } else {
-                console.error(`Could not read '${rawPlugin.name}' contribution 'grammars'.`, rawPlugin.contributes.grammars, grammarsResult.reason);
+                this.logger.error(`Could not read '${rawPlugin.name}' contribution 'grammars'.`, rawPlugin.contributes.grammars, grammarsResult.reason);
             }
         }
 
@@ -616,20 +628,20 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
         const result: ColorDefinition[] = [];
         for (const contribution of pck.contributes.colors) {
             if (typeof contribution.id !== 'string' || contribution.id.length === 0) {
-                console.error("'configuration.colors.id' must be defined and can not be empty");
+                this.logger.error("'configuration.colors.id' must be defined and can not be empty");
                 continue;
             }
             if (!contribution.id.match(colorIdPattern)) {
-                console.error("'configuration.colors.id' must follow the word[.word]*");
+                this.logger.error("'configuration.colors.id' must follow the word[.word]*");
                 continue;
             }
             if (typeof contribution.description !== 'string' || contribution.id.length === 0) {
-                console.error("'configuration.colors.description' must be defined and can not be empty");
+                this.logger.error("'configuration.colors.description' must be defined and can not be empty");
                 continue;
             }
             const defaults = contribution.defaults;
             if (!defaults || typeof defaults !== 'object' || typeof defaults.light !== 'string' || typeof defaults.dark !== 'string' || typeof defaults.highContrast !== 'string') {
-                console.error("'configuration.colors.defaults' must be defined and must contain 'light', 'dark' and 'highContrast'");
+                this.logger.error("'configuration.colors.defaults' must be defined and must contain 'light', 'dark' and 'highContrast'");
                 continue;
             }
             result.push({
@@ -671,11 +683,11 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
         const result: IconThemeContribution[] = [];
         for (const contribution of pck.contributes.iconThemes) {
             if (typeof contribution.id !== 'string') {
-                console.error('Expected string in `contributes.iconThemes.id`. Provided value:', contribution.id);
+                this.logger.error('Expected string in `contributes.iconThemes.id`. Provided value:', contribution.id);
                 continue;
             }
             if (typeof contribution.path !== 'string') {
-                console.error('Expected string in `contributes.iconThemes.path`. Provided value:', contribution.path);
+                this.logger.error('Expected string in `contributes.iconThemes.path`. Provided value:', contribution.path);
                 continue;
             }
             result.push({
@@ -698,13 +710,13 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
         for (const id in iconEntries) {
             if (pck.contributes.icons.hasOwnProperty(id)) {
                 if (!id.match(iconIdPattern)) {
-                    console.error("'configuration.icons' keys represent the icon id and can only contain letter, digits and minuses. " +
+                    this.logger.error("'configuration.icons' keys represent the icon id and can only contain letter, digits and minuses. " +
                         'They need to consist of at least two segments in the form `component-iconname`.', 'extension: ', pck.name, 'icon id: ', id);
                     return;
                 }
                 const iconContribution = iconEntries[id];
                 if (typeof iconContribution.description !== 'string' || iconContribution.description['length'] === 0) {
-                    console.error('configuration.icons.description must be defined and can not be empty, ', 'extension: ', pck.name, 'icon id: ', id);
+                    this.logger.error('configuration.icons.description must be defined and can not be empty, ', 'extension: ', pck.name, 'icon id: ', id);
                     return;
                 }
 
@@ -719,7 +731,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 } else if (typeof defaultIcon === 'object' && typeof defaultIcon.fontPath === 'string' && typeof defaultIcon.fontCharacter === 'string') {
                     const format = getFileExtension(defaultIcon.fontPath);
                     if (['woff', 'woff2', 'ttf'].indexOf(format) === -1) {
-                        console.warn("Expected `contributes.icons.default.fontPath` to have file extension 'woff', woff2' or 'ttf', is '{0}'.", format);
+                        this.logger.warn("Expected `contributes.icons.default.fontPath` to have file extension 'woff', woff2' or 'ttf', is '{0}'.", format);
                         return;
                     }
 
@@ -734,7 +746,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                         }
                     });
                 } else {
-                    console.error("'configuration.icons.default' must be either a reference to the id of an other theme icon (string) or a icon definition (object) with ",
+                    this.logger.error("'configuration.icons.default' must be either a reference to the id of an other theme icon (string) or a icon definition (object) with ",
                         'properties `fontPath` and `fontCharacter`.');
                 }
             }
@@ -769,7 +781,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
             return content;
         } catch (e) {
             if (!isENOENT(e)) {
-                console.error(e);
+                this.logger.error(e);
             }
             return '';
         }
@@ -1010,7 +1022,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
             return undefined;
         }
         if (!Array.isArray(source)) {
-            console.warn(`[${langId}]: language configuration: expected \`autoClosingPairs\` to be an array.`);
+            this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs\` to be an array.`);
             return undefined;
         }
 
@@ -1019,27 +1031,27 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
             const pair = source[i];
             if (Array.isArray(pair)) {
                 if (!isCharacterPair(pair)) {
-                    console.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}]\` to be an array of two strings or an object.`);
+                    this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}]\` to be an array of two strings or an object.`);
                     continue;
                 }
                 result = result || [];
                 result.push({ open: pair[0], close: pair[1] });
             } else {
                 if (!isObject(pair)) {
-                    console.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}]\` to be an array of two strings or an object.`);
+                    this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}]\` to be an array of two strings or an object.`);
                     continue;
                 }
                 if (typeof pair.open !== 'string') {
-                    console.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}].open\` to be a string.`);
+                    this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}].open\` to be a string.`);
                     continue;
                 }
                 if (typeof pair.close !== 'string') {
-                    console.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}].close\` to be a string.`);
+                    this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}].close\` to be a string.`);
                     continue;
                 }
                 if (typeof pair.notIn !== 'undefined') {
                     if (!isStringArray(pair.notIn)) {
-                        console.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}].notIn\` to be a string array.`);
+                        this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}].notIn\` to be a string array.`);
                         continue;
                     }
                 }
@@ -1056,7 +1068,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
             return undefined;
         }
         if (!Array.isArray(source)) {
-            console.warn(`[${langId}]: language configuration: expected \`surroundingPairs\` to be an array.`);
+            this.logger.warn(`[${langId}]: language configuration: expected \`surroundingPairs\` to be an array.`);
             return undefined;
         }
 
@@ -1065,22 +1077,22 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
             const pair = source[i];
             if (Array.isArray(pair)) {
                 if (!isCharacterPair(pair)) {
-                    console.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}]\` to be an array of two strings or an object.`);
+                    this.logger.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}]\` to be an array of two strings or an object.`);
                     continue;
                 }
                 result = result || [];
                 result.push({ open: pair[0], close: pair[1] });
             } else {
                 if (!isObject(pair)) {
-                    console.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}]\` to be an array of two strings or an object.`);
+                    this.logger.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}]\` to be an array of two strings or an object.`);
                     continue;
                 }
                 if (typeof pair.open !== 'string') {
-                    console.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}].open\` to be a string.`);
+                    this.logger.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}].open\` to be a string.`);
                     continue;
                 }
                 if (typeof pair.close !== 'string') {
-                    console.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}].close\` to be a string.`);
+                    this.logger.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}].close\` to be a string.`);
                     continue;
                 }
                 result = result || [];

package/src/main/browser/custom-editors/custom-editor-opener.tsx

@@ -105,6 +105,7 @@ export class CustomEditorOpener implements OpenHandler {
                     try {
                         w.viewType = this.editor.viewType;
                         w.resource = uri;
+                        w.updateID();
                         await this.editorRegistry.resolveWidget(w);
                         if (options?.widgetOptions) {
                             await this.shell.addWidget(w, options.widgetOptions);

package/src/main/browser/custom-editors/custom-editor-widget.ts

@@ -65,6 +65,10 @@ export class CustomEditorWidget extends WebviewWidget implements CustomEditorWid
         }));
     }
 
+    updateID(): void {
+        this.id = CustomEditorWidget.FACTORY_ID + `:${this.resource.toString()}:${this.identifier.id}`;
+    }
+
     undo(): void {
         this._modelRef.object?.undo();
     }

package/src/main/browser/custom-editors/custom-editors-main.ts

@@ -145,6 +145,8 @@ export class CustomEditorsMainImpl implements CustomEditorsMain, Disposable {
 
                 this.webviewsMain.hookWebview(widget);
                 widget.title.label = this.labelProvider.getName(resource);
+                widget.title.caption = resource.path.fsPath();
+                widget.title.iconClass = this.labelProvider.getIcon(resource) + ' file-icon';
 
                 const _cancellationSource = new CancellationTokenSource();
                 await this.proxy.$resolveWebviewEditor(

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

@@ -26,8 +26,6 @@ import {
 } from '../../../common/plugin-api-rpc';
 import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
 import { Breakpoint, DebugStackFrameDTO, DebugThreadDTO, WorkspaceFolder } from '../../../common/plugin-api-rpc-model';
-import { LabelProvider } from '@theia/core/lib/browser';
-import { EditorManager } from '@theia/editor/lib/browser';
 import { BreakpointManager, BreakpointsChangeEvent } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager';
 import { URI as Uri } from '@theia/core/shared/vscode-uri';
 import { SourceBreakpoint, FunctionBreakpoint, BaseBreakpoint } from '@theia/debug/lib/browser/breakpoint/breakpoint-marker';
@@ -35,10 +33,6 @@ import { DebugConfiguration, DebugSessionOptions } from '@theia/debug/lib/common
 import { DebuggerDescription } from '@theia/debug/lib/common/debug-service';
 import { DebugProtocol } from '@vscode/debugprotocol';
 import { DebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
-import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
-import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
-import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
-import { DebugPreferences } from '@theia/debug/lib/common/debug-preferences';
 import { PluginDebugAdapterContribution } from './plugin-debug-adapter-contribution';
 import { PluginDebugConfigurationProvider } from './plugin-debug-configuration-provider';
 import { PluginDebugSessionContributionRegistrator, PluginDebugSessionContributionRegistry } from './plugin-debug-session-contribution-registry';
@@ -46,17 +40,12 @@ import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposa
 import { PluginDebugSessionFactory } from './plugin-debug-session-factory';
 import { PluginDebugService } from './plugin-debug-service';
 import { HostedPluginSupport } from '../../../hosted/browser/hosted-plugin';
-import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { ConsoleSessionManager } from '@theia/console/lib/browser/console-session-manager';
 import { DebugConsoleSession } from '@theia/debug/lib/browser/console/debug-console-session';
-import { CommandService, ContributionProvider } from '@theia/core/lib/common';
-import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
 import { ConnectionImpl } from '../../../common/connection';
-import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { DebugSessionOptions as TheiaDebugSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
 import { DebugStackFrame } from '@theia/debug/lib/browser/model/debug-stack-frame';
 import { DebugThread } from '@theia/debug/lib/browser/model/debug-thread';
-import { TestService } from '@theia/test/lib/browser/test-service';
 import { DebugBreakpoint } from '@theia/debug/lib/browser/model/debug-breakpoint';
 
 function toOrigin<T extends BaseBreakpoint>(input: DebugBreakpoint<T>): T {
@@ -75,24 +64,14 @@ function eventToOrigins<T extends BaseBreakpoint>({ added, removed, changed, uri
 export class DebugMainImpl implements DebugMain, Disposable {
     private readonly debugExt: DebugExt;
 
+    private readonly container: interfaces.Container;
     private readonly sessionManager: DebugSessionManager;
-    private readonly labelProvider: LabelProvider;
-    private readonly editorManager: EditorManager;
     private readonly breakpointsManager: BreakpointManager;
     private readonly consoleSessionManager: ConsoleSessionManager;
     private readonly configurationManager: DebugConfigurationManager;
-    private readonly terminalService: TerminalService;
-    private readonly messages: MessageClient;
-    private readonly outputChannelManager: OutputChannelManager;
-    private readonly debugPreferences: DebugPreferences;
     private readonly sessionContributionRegistrator: PluginDebugSessionContributionRegistrator;
     private readonly pluginDebugService: PluginDebugService;
-    private readonly fileService: FileService;
     private readonly pluginService: HostedPluginSupport;
-    private readonly debugContributionProvider: ContributionProvider<DebugContribution>;
-    private readonly testService: TestService;
-    private readonly workspaceService: WorkspaceService;
-    private readonly commandService: CommandService;
 
     private readonly debuggerContributions = new Map<string, DisposableCollection>();
     private readonly configurationProviders = new Map<number, DisposableCollection>();
@@ -100,24 +79,14 @@ export class DebugMainImpl implements DebugMain, Disposable {
 
     constructor(rpc: RPCProtocol, readonly connectionMain: ConnectionImpl, container: interfaces.Container) {
         this.debugExt = rpc.getProxy(MAIN_RPC_CONTEXT.DEBUG_EXT);
+        this.container = container;
         this.sessionManager = container.get(DebugSessionManager);
-        this.labelProvider = container.get(LabelProvider);
-        this.editorManager = container.get(EditorManager);
         this.breakpointsManager = container.get(BreakpointManager);
         this.consoleSessionManager = container.get(ConsoleSessionManager);
         this.configurationManager = container.get(DebugConfigurationManager);
-        this.terminalService = container.get(TerminalService);
-        this.messages = container.get(MessageClient);
-        this.outputChannelManager = container.get(OutputChannelManager);
-        this.debugPreferences = container.get(DebugPreferences);
         this.pluginDebugService = container.get(PluginDebugService);
         this.sessionContributionRegistrator = container.get(PluginDebugSessionContributionRegistry);
-        this.debugContributionProvider = container.getNamed(ContributionProvider, DebugContribution);
-        this.fileService = container.get(FileService);
         this.pluginService = container.get(HostedPluginSupport);
-        this.testService = container.get(TestService);
-        this.workspaceService = container.get(WorkspaceService);
-        this.commandService = container.get(CommandService);
 
         const fireDidChangeBreakpoints = ({ added, removed, changed }: BreakpointsChangeEvent<SourceBreakpoint | FunctionBreakpoint>) => {
             this.debugExt.$breakpointsDidChange(
@@ -168,23 +137,12 @@ export class DebugMainImpl implements DebugMain, Disposable {
         }
 
         const debugSessionFactory = new PluginDebugSessionFactory(
-            this.terminalService,
-            this.editorManager,
-            this.breakpointsManager,
-            this.labelProvider,
-            this.messages,
-            this.outputChannelManager,
-            this.debugPreferences,
             async (sessionId: string) => {
                 const connection = await this.connectionMain.ensureConnection(sessionId);
                 return connection;
             },
-            this.fileService,
             terminalOptionsExt,
-            this.debugContributionProvider,
-            this.testService,
-            this.workspaceService,
-            this.commandService,
+            this.container,
         );
 
         const toDispose = new DisposableCollection(

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

@@ -16,13 +16,13 @@
 
 import { DebuggerDescription, DebugPath, DebugService, DynamicDebugConfigurationProvider } from '@theia/debug/lib/common/debug-service';
 import debounce = require('@theia/core/shared/lodash.debounce');
-import { deepClone, Emitter, Event, nls } from '@theia/core';
+import { deepClone, Emitter, Event, nls, ILogger } from '@theia/core';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { DebugConfiguration } from '@theia/debug/lib/common/debug-configuration';
 import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-schema';
 import { PluginDebugAdapterContribution } from './plugin-debug-adapter-contribution';
 import { PluginDebugConfigurationProvider } from './plugin-debug-configuration-provider';
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { CommandIdVariables } from '@theia/variable-resolver/lib/common/variable-types';
@@ -64,6 +64,8 @@ export class PluginDebugService implements DebugService {
     protected readonly connectionProvider: WebSocketConnectionProvider;
     @inject(WorkspaceService)
     protected readonly workspaceService: WorkspaceService;
+    @inject(ILogger) @named('plugin-ext:PluginDebugService')
+    protected readonly logger: ILogger;
 
     @postConstruct()
     protected init(): void {
@@ -84,7 +86,7 @@ export class PluginDebugService implements DebugService {
         const { type } = contrib;
 
         if (this.contributors.has(type)) {
-            console.warn(`Debugger with type '${type}' already registered.`);
+            this.logger.warn(`Debugger with type '${type}' already registered.`);
             return Disposable.NULL;
         }
 
@@ -105,7 +107,7 @@ export class PluginDebugService implements DebugService {
         if (this.configurationProviders.has(provider.handle)) {
             const configuration = this.configurationProviders.get(provider.handle);
             if (configuration && configuration.type !== provider.type) {
-                console.warn(`Different debug configuration provider with type '${configuration.type}' already registered.`);
+                this.logger.warn(`Different debug configuration provider with type '${configuration.type}' already registered.`);
                 provider.handle = this.configurationProviders.size;
             }
         }
@@ -358,7 +360,7 @@ export class PluginDebugService implements DebugService {
                 }
                 resolved = await resolver(workspaceFolderUri, resolved);
             } catch (e) {
-                console.error(e);
+                this.logger.error(e);
             }
         }
         return resolved;