@theia/vsx-registry 1.34.2 → 1.34.3

package/src/browser/vsx-extensions-view-container.ts

@@ -1,179 +1,179 @@
-/********************************************************************************
- * 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 WITH Classpath-exception-2.0
- *******************************************************************************‚*/
-
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { ViewContainer, PanelLayout, ViewContainerPart, Message, codicon } from '@theia/core/lib/browser';
-import { VSXExtensionsSearchBar } from './vsx-extensions-search-bar';
-import { VSXExtensionsModel } from './vsx-extensions-model';
-import { VSXSearchMode } from './vsx-extensions-search-model';
-import { generateExtensionWidgetId } from './vsx-extensions-widget';
-import { VSXExtensionsSourceOptions } from './vsx-extensions-source';
-import { VSXExtensionsCommands } from './vsx-extension-commands';
-import { nls } from '@theia/core/lib/common/nls';
-
-@injectable()
-export class VSXExtensionsViewContainer extends ViewContainer {
-
-    static ID = 'vsx-extensions-view-container';
-    static LABEL = nls.localizeByDefault('Extensions');
-
-    override disableDNDBetweenContainers = true;
-
-    @inject(VSXExtensionsSearchBar)
-    protected readonly searchBar: VSXExtensionsSearchBar;
-
-    @inject(VSXExtensionsModel)
-    protected readonly model: VSXExtensionsModel;
-
-    @postConstruct()
-    protected override init(): void {
-        super.init();
-        this.id = VSXExtensionsViewContainer.ID;
-        this.addClass('theia-vsx-extensions-view-container');
-
-        this.setTitleOptions({
-            label: VSXExtensionsViewContainer.LABEL,
-            iconClass: codicon('extensions'),
-            closeable: true
-        });
-    }
-
-    protected override onActivateRequest(msg: Message): void {
-        this.searchBar.activate();
-    }
-
-    protected override onAfterAttach(msg: Message): void {
-        super.onBeforeAttach(msg);
-        this.updateMode();
-        this.toDisposeOnDetach.push(this.model.search.onDidChangeQuery(() => this.updateMode()));
-    }
-
-    protected override configureLayout(layout: PanelLayout): void {
-        layout.addWidget(this.searchBar);
-        super.configureLayout(layout);
-    }
-
-    protected currentMode: VSXSearchMode = VSXSearchMode.Initial;
-    protected readonly lastModeState = new Map<VSXSearchMode, ViewContainer.State>();
-
-    protected updateMode(): void {
-        const currentMode = this.model.search.getModeForQuery();
-        if (currentMode === this.currentMode) {
-            return;
-        }
-        if (this.currentMode !== VSXSearchMode.Initial) {
-            this.lastModeState.set(this.currentMode, super.doStoreState());
-        }
-        this.currentMode = currentMode;
-        const lastState = this.lastModeState.get(currentMode);
-        if (lastState) {
-            super.doRestoreState(lastState);
-        } else {
-            for (const part of this.getParts()) {
-                this.applyModeToPart(part);
-            }
-        }
-
-        const specialWidgets = this.getWidgetsForMode();
-        if (specialWidgets?.length) {
-            const widgetChecker = new Set(specialWidgets);
-            const relevantParts = this.getParts().filter(part => widgetChecker.has(part.wrapped.id));
-            relevantParts.forEach(part => {
-                part.collapsed = false;
-                part.show();
-            });
-        }
-    }
-
-    protected override registerPart(part: ViewContainerPart): void {
-        super.registerPart(part);
-        this.applyModeToPart(part);
-    }
-
-    protected applyModeToPart(part: ViewContainerPart): void {
-        if (this.shouldShowWidget(part)) {
-            part.show();
-        } else {
-            part.hide();
-        }
-    }
-
-    protected shouldShowWidget(part: ViewContainerPart): boolean {
-        const widgetsToShow = this.getWidgetsForMode();
-        if (widgetsToShow.length) {
-            return widgetsToShow.includes(part.wrapped.id);
-        }
-        return part.wrapped.id !== generateExtensionWidgetId(VSXExtensionsSourceOptions.SEARCH_RESULT);
-    }
-
-    protected getWidgetsForMode(): string[] {
-        switch (this.currentMode) {
-            case VSXSearchMode.Builtin:
-                return [generateExtensionWidgetId(VSXExtensionsSourceOptions.BUILT_IN)];
-            case VSXSearchMode.Installed:
-                return [generateExtensionWidgetId(VSXExtensionsSourceOptions.INSTALLED)];
-            case VSXSearchMode.Recommended:
-                return [generateExtensionWidgetId(VSXExtensionsSourceOptions.RECOMMENDED)];
-            case VSXSearchMode.Search:
-                return [generateExtensionWidgetId(VSXExtensionsSourceOptions.SEARCH_RESULT)];
-            default:
-                return [];
-        }
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected override doStoreState(): any {
-        const modes: VSXExtensionsViewContainer.State['modes'] = {};
-        for (const mode of this.lastModeState.keys()) {
-            modes[mode] = this.lastModeState.get(mode);
-        }
-        return {
-            query: this.model.search.query,
-            modes
-        };
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected override doRestoreState(state: any): void {
-        // eslint-disable-next-line guard-for-in
-        for (const key in state.modes) {
-            const mode = Number(key) as VSXSearchMode;
-            const modeState = state.modes[mode];
-            if (modeState) {
-                this.lastModeState.set(mode, modeState);
-            }
-        }
-        this.model.search.query = state.query;
-    }
-
-    protected override updateToolbarItems(allParts: ViewContainerPart[]): void {
-        super.updateToolbarItems(allParts);
-        this.registerToolbarItem(VSXExtensionsCommands.INSTALL_FROM_VSIX.id, { tooltip: VSXExtensionsCommands.INSTALL_FROM_VSIX.label, group: 'other_1' });
-        this.registerToolbarItem(VSXExtensionsCommands.CLEAR_ALL.id, { tooltip: VSXExtensionsCommands.CLEAR_ALL.label, priority: 1, onDidChange: this.model.onDidChange });
-    }
-
-    protected override getToggleVisibilityGroupLabel(): string {
-        return 'a/' + nls.localizeByDefault('Views');
-    }
-}
-export namespace VSXExtensionsViewContainer {
-    export interface State {
-        query: string;
-        modes: {
-            [mode: number]: ViewContainer.State | undefined
-        }
-    }
-}
+/********************************************************************************
+ * 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 WITH Classpath-exception-2.0
+ *******************************************************************************‚*/
+
+import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { ViewContainer, PanelLayout, ViewContainerPart, Message, codicon } from '@theia/core/lib/browser';
+import { VSXExtensionsSearchBar } from './vsx-extensions-search-bar';
+import { VSXExtensionsModel } from './vsx-extensions-model';
+import { VSXSearchMode } from './vsx-extensions-search-model';
+import { generateExtensionWidgetId } from './vsx-extensions-widget';
+import { VSXExtensionsSourceOptions } from './vsx-extensions-source';
+import { VSXExtensionsCommands } from './vsx-extension-commands';
+import { nls } from '@theia/core/lib/common/nls';
+
+@injectable()
+export class VSXExtensionsViewContainer extends ViewContainer {
+
+    static ID = 'vsx-extensions-view-container';
+    static LABEL = nls.localizeByDefault('Extensions');
+
+    override disableDNDBetweenContainers = true;
+
+    @inject(VSXExtensionsSearchBar)
+    protected readonly searchBar: VSXExtensionsSearchBar;
+
+    @inject(VSXExtensionsModel)
+    protected readonly model: VSXExtensionsModel;
+
+    @postConstruct()
+    protected override init(): void {
+        super.init();
+        this.id = VSXExtensionsViewContainer.ID;
+        this.addClass('theia-vsx-extensions-view-container');
+
+        this.setTitleOptions({
+            label: VSXExtensionsViewContainer.LABEL,
+            iconClass: codicon('extensions'),
+            closeable: true
+        });
+    }
+
+    protected override onActivateRequest(msg: Message): void {
+        this.searchBar.activate();
+    }
+
+    protected override onAfterAttach(msg: Message): void {
+        super.onBeforeAttach(msg);
+        this.updateMode();
+        this.toDisposeOnDetach.push(this.model.search.onDidChangeQuery(() => this.updateMode()));
+    }
+
+    protected override configureLayout(layout: PanelLayout): void {
+        layout.addWidget(this.searchBar);
+        super.configureLayout(layout);
+    }
+
+    protected currentMode: VSXSearchMode = VSXSearchMode.Initial;
+    protected readonly lastModeState = new Map<VSXSearchMode, ViewContainer.State>();
+
+    protected updateMode(): void {
+        const currentMode = this.model.search.getModeForQuery();
+        if (currentMode === this.currentMode) {
+            return;
+        }
+        if (this.currentMode !== VSXSearchMode.Initial) {
+            this.lastModeState.set(this.currentMode, super.doStoreState());
+        }
+        this.currentMode = currentMode;
+        const lastState = this.lastModeState.get(currentMode);
+        if (lastState) {
+            super.doRestoreState(lastState);
+        } else {
+            for (const part of this.getParts()) {
+                this.applyModeToPart(part);
+            }
+        }
+
+        const specialWidgets = this.getWidgetsForMode();
+        if (specialWidgets?.length) {
+            const widgetChecker = new Set(specialWidgets);
+            const relevantParts = this.getParts().filter(part => widgetChecker.has(part.wrapped.id));
+            relevantParts.forEach(part => {
+                part.collapsed = false;
+                part.show();
+            });
+        }
+    }
+
+    protected override registerPart(part: ViewContainerPart): void {
+        super.registerPart(part);
+        this.applyModeToPart(part);
+    }
+
+    protected applyModeToPart(part: ViewContainerPart): void {
+        if (this.shouldShowWidget(part)) {
+            part.show();
+        } else {
+            part.hide();
+        }
+    }
+
+    protected shouldShowWidget(part: ViewContainerPart): boolean {
+        const widgetsToShow = this.getWidgetsForMode();
+        if (widgetsToShow.length) {
+            return widgetsToShow.includes(part.wrapped.id);
+        }
+        return part.wrapped.id !== generateExtensionWidgetId(VSXExtensionsSourceOptions.SEARCH_RESULT);
+    }
+
+    protected getWidgetsForMode(): string[] {
+        switch (this.currentMode) {
+            case VSXSearchMode.Builtin:
+                return [generateExtensionWidgetId(VSXExtensionsSourceOptions.BUILT_IN)];
+            case VSXSearchMode.Installed:
+                return [generateExtensionWidgetId(VSXExtensionsSourceOptions.INSTALLED)];
+            case VSXSearchMode.Recommended:
+                return [generateExtensionWidgetId(VSXExtensionsSourceOptions.RECOMMENDED)];
+            case VSXSearchMode.Search:
+                return [generateExtensionWidgetId(VSXExtensionsSourceOptions.SEARCH_RESULT)];
+            default:
+                return [];
+        }
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    protected override doStoreState(): any {
+        const modes: VSXExtensionsViewContainer.State['modes'] = {};
+        for (const mode of this.lastModeState.keys()) {
+            modes[mode] = this.lastModeState.get(mode);
+        }
+        return {
+            query: this.model.search.query,
+            modes
+        };
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    protected override doRestoreState(state: any): void {
+        // eslint-disable-next-line guard-for-in
+        for (const key in state.modes) {
+            const mode = Number(key) as VSXSearchMode;
+            const modeState = state.modes[mode];
+            if (modeState) {
+                this.lastModeState.set(mode, modeState);
+            }
+        }
+        this.model.search.query = state.query;
+    }
+
+    protected override updateToolbarItems(allParts: ViewContainerPart[]): void {
+        super.updateToolbarItems(allParts);
+        this.registerToolbarItem(VSXExtensionsCommands.INSTALL_FROM_VSIX.id, { tooltip: VSXExtensionsCommands.INSTALL_FROM_VSIX.label, group: 'other_1' });
+        this.registerToolbarItem(VSXExtensionsCommands.CLEAR_ALL.id, { tooltip: VSXExtensionsCommands.CLEAR_ALL.label, priority: 1, onDidChange: this.model.onDidChange });
+    }
+
+    protected override getToggleVisibilityGroupLabel(): string {
+        return 'a/' + nls.localizeByDefault('Views');
+    }
+}
+export namespace VSXExtensionsViewContainer {
+    export interface State {
+        query: string;
+        modes: {
+            [mode: number]: ViewContainer.State | undefined
+        }
+    }
+}

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

@@ -1,138 +1,138 @@
-// *****************************************************************************
-// 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 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>();
-
-    @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();
-    }
-
-    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.');
-                return <AlertMessage
-                    type='ERROR'
-                    header={`${message} ${searchError}`}
-                />;
-            }
-        }
-        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 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>();
+
+    @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();
+    }
+
+    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.');
+                return <AlertMessage
+                    type='ERROR'
+                    header={`${message} ${searchError}`}
+                />;
+            }
+        }
+        return super.renderTree(model);
+    }
+}