@theia/vsx-registry 1.45.0 → 1.46.0-next.72

package/src/browser/vsx-extensions-widget.tsx

@@ -1,156 +1,165 @@
-// *****************************************************************************
-// Copyright (C) 2020 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, interfaces, postConstruct, inject } from '@theia/core/shared/inversify';
-import { TreeModel, TreeNode } from '@theia/core/lib/browser';
-import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
-import { VSXExtensionsSource, VSXExtensionsSourceOptions } from './vsx-extensions-source';
-import { nls } from '@theia/core/lib/common/nls';
-import { BadgeWidget } from '@theia/core/lib/browser/view-container';
-import { Emitter, Event } from '@theia/core/lib/common';
-import { AlertMessage } from '@theia/core/lib/browser/widgets/alert-message';
-import * as React from '@theia/core/shared/react';
-
-@injectable()
-export class VSXExtensionsWidgetOptions extends VSXExtensionsSourceOptions {
-    title?: string;
-}
-
-export const generateExtensionWidgetId = (widgetId: string): string => VSXExtensionsWidget.ID + ':' + widgetId;
-
-@injectable()
-export class VSXExtensionsWidget extends SourceTreeWidget implements BadgeWidget {
-
-    static ID = 'vsx-extensions';
-
-    static createWidget(parent: interfaces.Container, options: VSXExtensionsWidgetOptions): VSXExtensionsWidget {
-        const child = SourceTreeWidget.createContainer(parent, {
-            virtualized: false,
-            scrollIfActive: true
-        });
-        child.bind(VSXExtensionsSourceOptions).toConstantValue(options);
-        child.bind(VSXExtensionsSource).toSelf();
-        child.unbind(SourceTreeWidget);
-        child.bind(VSXExtensionsWidgetOptions).toConstantValue(options);
-        child.bind(VSXExtensionsWidget).toSelf();
-        return child.get(VSXExtensionsWidget);
-    }
-
-    protected _badge?: number;
-    protected onDidChangeBadgeEmitter = new Emitter<void>();
-
-    protected _badgeTooltip?: string;
-    protected onDidChangeBadgeTooltipEmitter = new Emitter<void>();
-
-    @inject(VSXExtensionsWidgetOptions)
-    protected readonly options: VSXExtensionsWidgetOptions;
-
-    @inject(VSXExtensionsSource)
-    protected readonly extensionsSource: VSXExtensionsSource;
-
-    @postConstruct()
-    protected override init(): void {
-        super.init();
-        this.addClass('theia-vsx-extensions');
-
-        this.id = generateExtensionWidgetId(this.options.id);
-
-        this.toDispose.push(this.extensionsSource);
-        this.source = this.extensionsSource;
-
-        const title = this.options.title ?? this.computeTitle();
-        this.title.label = title;
-        this.title.caption = title;
-
-        this.toDispose.push(this.source.onDidChange(async () => {
-            this.badge = await this.resolveCount();
-        }));
-    }
-
-    get onDidChangeBadge(): Event<void> {
-        return this.onDidChangeBadgeEmitter.event;
-    }
-
-    get badge(): number | undefined {
-        return this._badge;
-    }
-
-    set badge(count: number | undefined) {
-        this._badge = count;
-        this.onDidChangeBadgeEmitter.fire();
-    }
-
-    get onDidChangeBadgeTooltip(): Event<void> {
-        return this.onDidChangeBadgeTooltipEmitter.event;
-    }
-
-    get badgeTooltip(): string | undefined {
-        return this._badgeTooltip;
-    }
-
-    set badgeTooltip(tooltip: string | undefined) {
-        this._badgeTooltip = tooltip;
-        this.onDidChangeBadgeTooltipEmitter.fire();
-    }
-
-    protected computeTitle(): string {
-        switch (this.options.id) {
-            case VSXExtensionsSourceOptions.INSTALLED:
-                return nls.localizeByDefault('Installed');
-            case VSXExtensionsSourceOptions.BUILT_IN:
-                return nls.localizeByDefault('Built-in');
-            case VSXExtensionsSourceOptions.RECOMMENDED:
-                return nls.localizeByDefault('Recommended');
-            case VSXExtensionsSourceOptions.SEARCH_RESULT:
-                return 'Open VSX Registry';
-            default:
-                return '';
-        }
-    }
-
-    protected async resolveCount(): Promise<number | undefined> {
-        if (this.options.id !== VSXExtensionsSourceOptions.SEARCH_RESULT) {
-            const elements = await this.source?.getElements() || [];
-            return [...elements].length;
-        }
-        return undefined;
-    }
-
-    protected override tapNode(node?: TreeNode): void {
-        super.tapNode(node);
-        this.model.openNode(node);
-    }
-
-    protected override handleDblClickEvent(): void {
-        // Don't open the editor view on a double click.
-    }
-
-    protected override renderTree(model: TreeModel): React.ReactNode {
-        if (this.options.id === VSXExtensionsSourceOptions.SEARCH_RESULT) {
-            const searchError = this.extensionsSource.getModel().searchError;
-            if (!!searchError) {
-                const message = nls.localize('theia/vsx-registry/errorFetching', 'Error fetching extensions.');
-                const configurationHint = nls.localize('theia/vsx-registry/errorFetchingConfigurationHint', 'This could be caused by network configuration issues.');
-                const hint = searchError.includes('ENOTFOUND') ? configurationHint : '';
-                return <AlertMessage
-                    type='ERROR'
-                    header={`${message} ${searchError} ${hint}`}
-                />;
-            }
-        }
-        return super.renderTree(model);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, interfaces, postConstruct, inject } from '@theia/core/shared/inversify';
+import { Message, TreeModel, TreeNode } from '@theia/core/lib/browser';
+import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
+import { VSXExtensionsSource, VSXExtensionsSourceOptions } from './vsx-extensions-source';
+import { nls } from '@theia/core/lib/common/nls';
+import { BadgeWidget } from '@theia/core/lib/browser/view-container';
+import { Emitter, Event } from '@theia/core/lib/common';
+import { AlertMessage } from '@theia/core/lib/browser/widgets/alert-message';
+import * as React from '@theia/core/shared/react';
+
+@injectable()
+export class VSXExtensionsWidgetOptions extends VSXExtensionsSourceOptions {
+    title?: string;
+}
+
+export const generateExtensionWidgetId = (widgetId: string): string => VSXExtensionsWidget.ID + ':' + widgetId;
+
+@injectable()
+export class VSXExtensionsWidget extends SourceTreeWidget implements BadgeWidget {
+
+    static ID = 'vsx-extensions';
+
+    static createWidget(parent: interfaces.Container, options: VSXExtensionsWidgetOptions): VSXExtensionsWidget {
+        const child = SourceTreeWidget.createContainer(parent, {
+            virtualized: false,
+            scrollIfActive: true
+        });
+        child.bind(VSXExtensionsSourceOptions).toConstantValue(options);
+        child.bind(VSXExtensionsSource).toSelf();
+        child.unbind(SourceTreeWidget);
+        child.bind(VSXExtensionsWidgetOptions).toConstantValue(options);
+        child.bind(VSXExtensionsWidget).toSelf();
+        return child.get(VSXExtensionsWidget);
+    }
+
+    protected _badge?: number;
+    protected onDidChangeBadgeEmitter = new Emitter<void>();
+
+    protected _badgeTooltip?: string;
+    protected onDidChangeBadgeTooltipEmitter = new Emitter<void>();
+
+    @inject(VSXExtensionsWidgetOptions)
+    protected readonly options: VSXExtensionsWidgetOptions;
+
+    @inject(VSXExtensionsSource)
+    protected readonly extensionsSource: VSXExtensionsSource;
+
+    @postConstruct()
+    protected override init(): void {
+        super.init();
+        this.addClass('theia-vsx-extensions');
+
+        this.id = generateExtensionWidgetId(this.options.id);
+
+        this.toDispose.push(this.extensionsSource);
+        this.source = this.extensionsSource;
+
+        const title = this.options.title ?? this.computeTitle();
+        this.title.label = title;
+        this.title.caption = title;
+
+        this.toDispose.push(this.source.onDidChange(async () => {
+            this.badge = await this.resolveCount();
+        }));
+    }
+
+    get onDidChangeBadge(): Event<void> {
+        return this.onDidChangeBadgeEmitter.event;
+    }
+
+    get badge(): number | undefined {
+        return this._badge;
+    }
+
+    set badge(count: number | undefined) {
+        this._badge = count;
+        this.onDidChangeBadgeEmitter.fire();
+    }
+
+    get onDidChangeBadgeTooltip(): Event<void> {
+        return this.onDidChangeBadgeTooltipEmitter.event;
+    }
+
+    get badgeTooltip(): string | undefined {
+        return this._badgeTooltip;
+    }
+
+    set badgeTooltip(tooltip: string | undefined) {
+        this._badgeTooltip = tooltip;
+        this.onDidChangeBadgeTooltipEmitter.fire();
+    }
+
+    protected computeTitle(): string {
+        switch (this.options.id) {
+            case VSXExtensionsSourceOptions.INSTALLED:
+                return nls.localizeByDefault('Installed');
+            case VSXExtensionsSourceOptions.BUILT_IN:
+                return nls.localizeByDefault('Built-in');
+            case VSXExtensionsSourceOptions.RECOMMENDED:
+                return nls.localizeByDefault('Recommended');
+            case VSXExtensionsSourceOptions.SEARCH_RESULT:
+                return 'Open VSX Registry';
+            default:
+                return '';
+        }
+    }
+
+    protected async resolveCount(): Promise<number | undefined> {
+        if (this.options.id !== VSXExtensionsSourceOptions.SEARCH_RESULT) {
+            const elements = await this.source?.getElements() || [];
+            return [...elements].length;
+        }
+        return undefined;
+    }
+
+    protected override tapNode(node?: TreeNode): void {
+        super.tapNode(node);
+        this.model.openNode(node);
+    }
+
+    protected override handleDblClickEvent(): void {
+        // Don't open the editor view on a double click.
+    }
+
+    protected override renderTree(model: TreeModel): React.ReactNode {
+        if (this.options.id === VSXExtensionsSourceOptions.SEARCH_RESULT) {
+            const searchError = this.extensionsSource.getModel().searchError;
+            if (!!searchError) {
+                const message = nls.localize('theia/vsx-registry/errorFetching', 'Error fetching extensions.');
+                const configurationHint = nls.localize('theia/vsx-registry/errorFetchingConfigurationHint', 'This could be caused by network configuration issues.');
+                const hint = searchError.includes('ENOTFOUND') ? configurationHint : '';
+                return <AlertMessage
+                    type='ERROR'
+                    header={`${message} ${searchError} ${hint}`}
+                />;
+            }
+        }
+        return super.renderTree(model);
+    }
+
+    protected override onAfterShow(msg: Message): void {
+        super.onAfterShow(msg);
+        if (this.options.id === VSXExtensionsSourceOptions.INSTALLED) {
+            // This is needed when an Extension was installed outside of the extension view.
+            // E.g. using explorer context menu.
+            this.doUpdateRows();
+        }
+    }
+}

package/src/browser/vsx-language-quick-pick-service.ts

@@ -1,110 +1,110 @@
-// *****************************************************************************
-// Copyright (C) 2022 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { LanguageQuickPickItem, LanguageQuickPickService } from '@theia/core/lib/browser/i18n/language-quick-pick-service';
-import { RequestContext, RequestService } from '@theia/core/shared/@theia/request';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { LanguageInfo } from '@theia/core/lib/common/i18n/localization';
-import { PluginPackage, PluginServer } from '@theia/plugin-ext';
-import { OVSXClientProvider } from '../common/ovsx-client-provider';
-import { VSXSearchEntry } from '@theia/ovsx-client';
-import { VSCodeExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
-import { nls } from '@theia/core/lib/common/nls';
-import { MessageService } from '@theia/core/lib/common/message-service';
-
-@injectable()
-export class VSXLanguageQuickPickService extends LanguageQuickPickService {
-
-    @inject(OVSXClientProvider)
-    protected readonly clientProvider: OVSXClientProvider;
-
-    @inject(RequestService)
-    protected readonly requestService: RequestService;
-
-    @inject(PluginServer)
-    protected readonly pluginServer: PluginServer;
-
-    @inject(MessageService)
-    protected readonly messageService: MessageService;
-
-    protected override async getAvailableLanguages(): Promise<LanguageQuickPickItem[]> {
-        const client = await this.clientProvider();
-        const searchResult = await client.search({
-            category: 'Language Packs',
-            sortBy: 'downloadCount',
-            sortOrder: 'desc',
-            size: 20
-        });
-        if (searchResult.error) {
-            throw new Error('Error while loading available languages: ' + searchResult.error);
-        }
-
-        const extensionLanguages = await Promise.all(
-            searchResult.extensions.map(async extension => ({
-                extension,
-                languages: await this.loadExtensionLanguages(extension)
-            }))
-        );
-
-        const languages = new Map<string, LanguageQuickPickItem>();
-
-        for (const extension of extensionLanguages) {
-            for (const localizationContribution of extension.languages) {
-                if (!languages.has(localizationContribution.languageId)) {
-                    languages.set(localizationContribution.languageId, {
-                        ...this.createLanguageQuickPickItem(localizationContribution),
-                        execute: async () => {
-                            const progress = await this.messageService.showProgress({
-                                text: nls.localizeByDefault('Installing {0} language support...',
-                                    localizationContribution.localizedLanguageName ?? localizationContribution.languageName ?? localizationContribution.languageId),
-                            });
-                            try {
-                                const extensionUri = VSCodeExtensionUri.toUri(extension.extension.name, extension.extension.namespace).toString();
-                                await this.pluginServer.deploy(extensionUri);
-                            } finally {
-                                progress.cancel();
-                            }
-                        }
-                    });
-                }
-            }
-        }
-        return Array.from(languages.values());
-    }
-
-    protected async loadExtensionLanguages(extension: VSXSearchEntry): Promise<LanguageInfo[]> {
-        // When searching for extensions on ovsx, we don't receive the `manifest` property.
-        // This property is only set when querying a specific extension.
-        // To improve performance, we assume that a manifest exists at `/package.json`.
-        const downloadUrl = extension.files.download;
-        const parentUrl = downloadUrl.substring(0, downloadUrl.lastIndexOf('/'));
-        const manifestUrl = parentUrl + '/package.json';
-        try {
-            const manifestRequest = await this.requestService.request({ url: manifestUrl });
-            const manifestContent = RequestContext.asJson<PluginPackage>(manifestRequest);
-            const localizations = manifestContent.contributes?.localizations ?? [];
-            return localizations.map(e => ({
-                languageId: e.languageId,
-                languageName: e.languageName,
-                localizedLanguageName: e.localizedLanguageName,
-                languagePack: true
-            }));
-        } catch {
-            // The `package.json` file might not actually exist, simply return an empty array
-            return [];
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2022 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { LanguageQuickPickItem, LanguageQuickPickService } from '@theia/core/lib/browser/i18n/language-quick-pick-service';
+import { RequestContext, RequestService } from '@theia/core/shared/@theia/request';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { LanguageInfo } from '@theia/core/lib/common/i18n/localization';
+import { PluginPackage, PluginServer } from '@theia/plugin-ext';
+import { OVSXClientProvider } from '../common/ovsx-client-provider';
+import { VSXSearchEntry } from '@theia/ovsx-client';
+import { VSCodeExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
+import { nls } from '@theia/core/lib/common/nls';
+import { MessageService } from '@theia/core/lib/common/message-service';
+
+@injectable()
+export class VSXLanguageQuickPickService extends LanguageQuickPickService {
+
+    @inject(OVSXClientProvider)
+    protected readonly clientProvider: OVSXClientProvider;
+
+    @inject(RequestService)
+    protected readonly requestService: RequestService;
+
+    @inject(PluginServer)
+    protected readonly pluginServer: PluginServer;
+
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
+
+    protected override async getAvailableLanguages(): Promise<LanguageQuickPickItem[]> {
+        const client = await this.clientProvider();
+        const searchResult = await client.search({
+            category: 'Language Packs',
+            sortBy: 'downloadCount',
+            sortOrder: 'desc',
+            size: 20
+        });
+        if (searchResult.error) {
+            throw new Error('Error while loading available languages: ' + searchResult.error);
+        }
+
+        const extensionLanguages = await Promise.all(
+            searchResult.extensions.map(async extension => ({
+                extension,
+                languages: await this.loadExtensionLanguages(extension)
+            }))
+        );
+
+        const languages = new Map<string, LanguageQuickPickItem>();
+
+        for (const extension of extensionLanguages) {
+            for (const localizationContribution of extension.languages) {
+                if (!languages.has(localizationContribution.languageId)) {
+                    languages.set(localizationContribution.languageId, {
+                        ...this.createLanguageQuickPickItem(localizationContribution),
+                        execute: async () => {
+                            const progress = await this.messageService.showProgress({
+                                text: nls.localizeByDefault('Installing {0} language support...',
+                                    localizationContribution.localizedLanguageName ?? localizationContribution.languageName ?? localizationContribution.languageId),
+                            });
+                            try {
+                                const extensionUri = VSCodeExtensionUri.toUri(extension.extension.name, extension.extension.namespace).toString();
+                                await this.pluginServer.deploy(extensionUri);
+                            } finally {
+                                progress.cancel();
+                            }
+                        }
+                    });
+                }
+            }
+        }
+        return Array.from(languages.values());
+    }
+
+    protected async loadExtensionLanguages(extension: VSXSearchEntry): Promise<LanguageInfo[]> {
+        // When searching for extensions on ovsx, we don't receive the `manifest` property.
+        // This property is only set when querying a specific extension.
+        // To improve performance, we assume that a manifest exists at `/package.json`.
+        const downloadUrl = extension.files.download;
+        const parentUrl = downloadUrl.substring(0, downloadUrl.lastIndexOf('/'));
+        const manifestUrl = parentUrl + '/package.json';
+        try {
+            const manifestRequest = await this.requestService.request({ url: manifestUrl });
+            const manifestContent = RequestContext.asJson<PluginPackage>(manifestRequest);
+            const localizations = manifestContent.contributes?.localizations ?? [];
+            return localizations.map(e => ({
+                languageId: e.languageId,
+                languageName: e.languageName,
+                localizedLanguageName: e.localizedLanguageName,
+                languagePack: true
+            }));
+        } catch {
+            // The `package.json` file might not actually exist, simply return an empty array
+            return [];
+        }
+    }
+}