@theia/plugin-ext 1.28.0-next.2 → 1.28.0-next.26

package/src/hosted/node/hosted-plugin-localization-service.ts

@@ -19,9 +19,12 @@ import * as fs from '@theia/core/shared/fs-extra';
 import { LocalizationProvider } from '@theia/core/lib/node/i18n/localization-provider';
 import { Localization } from '@theia/core/lib/common/i18n/localization';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { DeployedPlugin, Localization as PluginLocalization } from '../../common';
+import { DeployedPlugin, Localization as PluginLocalization, PluginIdentifiers } from '../../common';
 import { URI } from '@theia/core/shared/vscode-uri';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+import { BackendApplicationContribution } from '@theia/core/lib/node';
+import { Disposable } from '@theia/core';
+import { Deferred } from '@theia/core/lib/common/promise-util';
 
 export interface VSCodeNlsConfig {
     locale: string
@@ -34,7 +37,7 @@ export interface VSCodeNlsConfig {
 }
 
 @injectable()
-export class HostedPluginLocalizationService {
+export class HostedPluginLocalizationService implements BackendApplicationContribution {
 
     @inject(LocalizationProvider)
     protected readonly localizationProvider: LocalizationProvider;
@@ -42,14 +45,39 @@ export class HostedPluginLocalizationService {
     @inject(EnvVariablesServer)
     protected readonly envVariables: EnvVariablesServer;
 
+    protected localizationDisposeMap = new Map<string, Disposable>();
     protected translationConfigFiles: Map<string, string> = new Map();
 
+    protected readonly _ready = new Deferred();
+
+    /**
+     * This promise resolves when the cache has been cleaned up after starting the backend server.
+     * Once resolved, the service allows to cache localization files for plugins.
+     */
+    ready = this._ready.promise;
+
+    async initialize(): Promise<void> {
+        const cacheDir = await this.getLocalizationCacheDir();
+        await fs.emptyDir(cacheDir);
+        this._ready.resolve();
+    }
+
     deployLocalizations(plugin: DeployedPlugin): void {
         if (plugin.contributes?.localizations) {
-            this.localizationProvider.addLocalizations(...buildLocalizations(plugin.contributes.localizations));
+            const localizations = buildLocalizations(plugin.contributes.localizations);
+            const versionedId = PluginIdentifiers.componentsToVersionedId(plugin.metadata.model);
+            this.localizationDisposeMap.set(versionedId, Disposable.create(() => {
+                this.localizationProvider.removeLocalizations(...localizations);
+                this.localizationDisposeMap.delete(versionedId);
+            }));
+            this.localizationProvider.addLocalizations(...localizations);
         }
     }
 
+    undeployLocalizations(plugin: PluginIdentifiers.VersionedId): void {
+        this.localizationDisposeMap.get(plugin)?.dispose();
+    }
+
     async localizePlugin(plugin: DeployedPlugin): Promise<DeployedPlugin> {
         const currentLanguage = this.localizationProvider.getCurrentLanguage();
         const localization = this.localizationProvider.loadLocalization(currentLanguage);
@@ -85,8 +113,8 @@ export class HostedPluginLocalizationService {
     }
 
     async buildTranslationConfig(plugins: DeployedPlugin[]): Promise<void> {
-        const configDir = URI.parse(await this.envVariables.getConfigDirUri()).fsPath;
-        const cacheDir = path.join(configDir, 'localization-cache');
+        await this.ready;
+        const cacheDir = await this.getLocalizationCacheDir();
         const configs = new Map<string, Record<string, string>>();
         for (const plugin of plugins) {
             if (plugin.contributes?.localizations) {
@@ -110,6 +138,12 @@ export class HostedPluginLocalizationService {
             await fs.writeJson(configFile, config);
         }
     }
+
+    protected async getLocalizationCacheDir(): Promise<string> {
+        const configDir = URI.parse(await this.envVariables.getConfigDirUri()).fsPath;
+        const cacheDir = path.join(configDir, 'localization-cache');
+        return cacheDir;
+    }
 }
 
 function buildLocalizations(localizations: PluginLocalization[]): Localization[] {

package/src/hosted/node/plugin-ext-hosted-backend-module.ts

@@ -60,6 +60,7 @@ export function bindCommonHostedBackend(bind: interfaces.Bind): void {
     bind(BackendApplicationContribution).toService(HostedPluginReader);
 
     bind(HostedPluginLocalizationService).toSelf().inSingletonScope();
+    bind(BackendApplicationContribution).toService(HostedPluginLocalizationService);
     bind(HostedPluginDeployerHandler).toSelf().inSingletonScope();
     bind(PluginDeployerHandler).toService(HostedPluginDeployerHandler);
 

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

@@ -190,7 +190,7 @@ export class TheiaPluginScanner implements PluginScanner {
 
         try {
             if (rawPlugin.contributes!.submenus) {
-                contributions.submenus = this.readSubmenus(rawPlugin.contributes.submenus!);
+                contributions.submenus = this.readSubmenus(rawPlugin.contributes.submenus!, rawPlugin);
             }
         } catch (err) {
             console.error(`Could not read '${rawPlugin.name}' contribution 'submenus'.`, rawPlugin.contributes!.submenus, err);
@@ -390,23 +390,27 @@ export class TheiaPluginScanner implements PluginScanner {
     }
 
     protected readCommand({ command, title, original, category, icon, enablement }: PluginPackageCommand, pck: PluginPackage): PluginCommand {
-        let themeIcon: string | undefined;
-        let iconUrl: IconUrl | undefined;
-        if (icon) {
-            if (typeof icon === 'string') {
-                if (icon.startsWith('$(')) {
-                    themeIcon = icon;
+        const { themeIcon, iconUrl } = this.transformIconUrl(pck, icon) ?? {};
+        return { command, title, originalTitle: original, category, iconUrl, themeIcon, enablement };
+    }
+
+    protected transformIconUrl(plugin: PluginPackage, original?: IconUrl): { iconUrl?: IconUrl; themeIcon?: string } | undefined {
+        if (original) {
+            if (typeof original === 'string') {
+                if (original.startsWith('$(')) {
+                    return { themeIcon: original };
                 } else {
-                    iconUrl = this.toPluginUrl(pck, icon);
+                    return { iconUrl: this.toPluginUrl(plugin, original) };
                 }
             } else {
-                iconUrl = {
-                    light: this.toPluginUrl(pck, icon.light),
-                    dark: this.toPluginUrl(pck, icon.dark)
+                return {
+                    iconUrl: {
+                        light: this.toPluginUrl(plugin, original.light),
+                        dark: this.toPluginUrl(plugin, original.dark)
+                    }
                 };
             }
         }
-        return { command, title, originalTitle: original, category, iconUrl, themeIcon, enablement };
     }
 
     protected toPluginUrl(pck: PluginPackage, relativePath: string): string {
@@ -629,12 +633,14 @@ export class TheiaPluginScanner implements PluginScanner {
         return rawLanguages.map(language => this.readLanguage(language, pluginPath));
     }
 
-    private readSubmenus(rawSubmenus: PluginPackageSubmenu[]): Submenu[] {
-        return rawSubmenus.map(submenu => this.readSubmenu(submenu));
+    private readSubmenus(rawSubmenus: PluginPackageSubmenu[], plugin: PluginPackage): Submenu[] {
+        return rawSubmenus.map(submenu => this.readSubmenu(submenu, plugin));
     }
 
-    private readSubmenu(rawSubmenu: PluginPackageSubmenu): Submenu {
+    private readSubmenu(rawSubmenu: PluginPackageSubmenu, plugin: PluginPackage): Submenu {
+        const icon = this.transformIconUrl(plugin, rawSubmenu.icon);
         return {
+            icon: icon?.iconUrl ?? icon?.themeIcon,
             id: rawSubmenu.id,
             label: rawSubmenu.label
         };

package/src/main/browser/comments/comment-thread-widget.tsx

@@ -96,7 +96,7 @@ export class CommentThreadWidget extends BaseWidget {
             }
         }));
         this.contextMenu = this.menus.getMenu(COMMENT_THREAD_CONTEXT);
-        this.contextMenu.children.map(node => node instanceof ActionMenuNode && node.action.when).forEach(exp => {
+        this.contextMenu.children.map(node => node instanceof ActionMenuNode && node.when).forEach(exp => {
             if (typeof exp === 'string') {
                 this.contextKeyService.setExpression(exp);
             }
@@ -377,7 +377,7 @@ export class CommentForm<P extends CommentForm.Props = CommentForm.Props> extend
         };
 
         this.menu = this.props.menus.getMenu(COMMENT_THREAD_CONTEXT);
-        this.menu.children.map(node => node instanceof ActionMenuNode && node.action.when).forEach(exp => {
+        this.menu.children.map(node => node instanceof ActionMenuNode && node.when).forEach(exp => {
             if (typeof exp === 'string') {
                 this.props.contextKeyService.setExpression(exp);
             }
@@ -597,7 +597,7 @@ namespace CommentsInlineAction {
 export class CommentsInlineAction extends React.Component<CommentsInlineAction.Props> {
     override render(): React.ReactNode {
         const { node, commands, contextKeyService, commentThread, commentUniqueId } = this.props;
-        if (node.action.when && !contextKeyService.match(node.action.when)) {
+        if (node.when && !contextKeyService.match(node.when)) {
             return false;
         }
         return <div className='theia-comments-inline-action'>
@@ -657,10 +657,10 @@ export class CommentAction extends React.Component<CommentAction.Props> {
     override render(): React.ReactNode {
         const classNames = ['comments-button', 'comments-text-button', 'theia-button'];
         const { node, commands, contextKeyService, onClick } = this.props;
-        if (node.action.when && !contextKeyService.match(node.action.when)) {
+        if (node.when && !contextKeyService.match(node.when)) {
             return false;
         }
-        const isEnabled = commands.isEnabled(node.action.commandId);
+        const isEnabled = commands.isEnabled(node.command);
         if (!isEnabled) {
             classNames.push(DISABLED_CLASS);
         }

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

@@ -37,10 +37,15 @@ import * as theia from '@theia/plugin';
 @injectable()
 export class PluginDebugService implements DebugService {
 
+    protected readonly onDidChangeDebuggersEmitter = new Emitter<void>();
+    get onDidChangeDebuggers(): Event<void> {
+        return this.onDidChangeDebuggersEmitter.event;
+    }
+
     protected readonly debuggers: DebuggerContribution[] = [];
     protected readonly contributors = new Map<string, PluginDebugAdapterContribution>();
     protected readonly configurationProviders = new Map<number, PluginDebugConfigurationProvider>();
-    protected readonly toDispose = new DisposableCollection();
+    protected readonly toDispose = new DisposableCollection(this.onDidChangeDebuggersEmitter);
 
     protected readonly onDidChangeDebugConfigurationProvidersEmitter = new Emitter<void>();
     get onDidChangeDebugConfigurationProviders(): Event<void> {

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

@@ -67,6 +67,11 @@ import { IRelativePattern } from '@theia/monaco-editor-core/esm/vs/base/common/g
 import { EditorLanguageStatusService, LanguageStatus as EditorLanguageStatus } from '@theia/editor/lib/browser/language-status/editor-language-status-service';
 import { LanguageSelector, RelativePattern } from '@theia/editor/lib/common/language-selector';
 
+/**
+ * @monaco-uplift The public API declares these functions as (languageId: string, service).
+ * Confirm that the functions delegate to a handler that accepts a LanguageSelector rather than just a string.
+ * Relevant code in node_modules/@theia/monaco-editor-core/src/vs/editor/standalone/browser/standaloneLanguages.ts
+ */
 interface RegistrationFunction<T> {
     (languageId: MonacoLanguageSelector.LanguageSelector, service: T): Disposable;
 }