@theia/plugin-ext 1.53.0-next.55 → 1.53.0-next.64

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

@@ -1,82 +1,82 @@
-// *****************************************************************************
-// Copyright (C) 2021 Red Hat, Inc. 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
-// *****************************************************************************
-
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-// code copied and modified from https://github.com/microsoft/vscode/blob/1.55.2/src/vs/workbench/api/browser/mainThreadSecretState.ts
-
-import { SecretsExt, SecretsMain } from '../../common/plugin-api-rpc';
-import { RPCProtocol } from '../../common/rpc-protocol';
-import { interfaces } from '@theia/core/shared/inversify';
-import { MAIN_RPC_CONTEXT } from '../../common';
-import { CredentialsService } from '@theia/core/lib/browser/credentials-service';
-
-export class SecretsMainImpl implements SecretsMain {
-
-    private readonly proxy: SecretsExt;
-    private readonly credentialsService: CredentialsService;
-
-    constructor(rpc: RPCProtocol, container: interfaces.Container) {
-        this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.SECRETS_EXT);
-        this.credentialsService = container.get(CredentialsService);
-        this.credentialsService.onDidChangePassword(e => {
-            const extensionId = e.service.substring(window.location.hostname.length + 1);
-            this.proxy.$onDidChangePassword({ extensionId, key: e.account });
-        });
-    }
-
-    private static getFullKey(extensionId: string): string {
-        return `${window.location.hostname}-${extensionId}`;
-    }
-
-    async $getPassword(extensionId: string, key: string): Promise<string | undefined> {
-        const fullKey = SecretsMainImpl.getFullKey(extensionId);
-        const passwordData = await this.credentialsService.getPassword(fullKey, key);
-
-        if (passwordData) {
-            try {
-                const data = JSON.parse(passwordData);
-                if (data.extensionId === extensionId) {
-                    return data.content;
-                }
-            } catch (e) {
-                throw new Error('Cannot get password');
-            }
-        }
-
-        return undefined;
-    }
-
-    async $setPassword(extensionId: string, key: string, value: string): Promise<void> {
-        const fullKey = SecretsMainImpl.getFullKey(extensionId);
-        const passwordData = JSON.stringify({
-            extensionId,
-            content: value
-        });
-        return this.credentialsService.setPassword(fullKey, key, passwordData);
-    }
-
-    async $deletePassword(extensionId: string, key: string): Promise<void> {
-        try {
-            const fullKey = SecretsMainImpl.getFullKey(extensionId);
-            await this.credentialsService.deletePassword(fullKey, key);
-        } catch (e) {
-            throw new Error('Cannot delete password');
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 Red Hat, Inc. 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
+// *****************************************************************************
+
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// code copied and modified from https://github.com/microsoft/vscode/blob/1.55.2/src/vs/workbench/api/browser/mainThreadSecretState.ts
+
+import { SecretsExt, SecretsMain } from '../../common/plugin-api-rpc';
+import { RPCProtocol } from '../../common/rpc-protocol';
+import { interfaces } from '@theia/core/shared/inversify';
+import { MAIN_RPC_CONTEXT } from '../../common';
+import { CredentialsService } from '@theia/core/lib/browser/credentials-service';
+
+export class SecretsMainImpl implements SecretsMain {
+
+    private readonly proxy: SecretsExt;
+    private readonly credentialsService: CredentialsService;
+
+    constructor(rpc: RPCProtocol, container: interfaces.Container) {
+        this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.SECRETS_EXT);
+        this.credentialsService = container.get(CredentialsService);
+        this.credentialsService.onDidChangePassword(e => {
+            const extensionId = e.service.substring(window.location.hostname.length + 1);
+            this.proxy.$onDidChangePassword({ extensionId, key: e.account });
+        });
+    }
+
+    private static getFullKey(extensionId: string): string {
+        return `${window.location.hostname}-${extensionId}`;
+    }
+
+    async $getPassword(extensionId: string, key: string): Promise<string | undefined> {
+        const fullKey = SecretsMainImpl.getFullKey(extensionId);
+        const passwordData = await this.credentialsService.getPassword(fullKey, key);
+
+        if (passwordData) {
+            try {
+                const data = JSON.parse(passwordData);
+                if (data.extensionId === extensionId) {
+                    return data.content;
+                }
+            } catch (e) {
+                throw new Error('Cannot get password');
+            }
+        }
+
+        return undefined;
+    }
+
+    async $setPassword(extensionId: string, key: string, value: string): Promise<void> {
+        const fullKey = SecretsMainImpl.getFullKey(extensionId);
+        const passwordData = JSON.stringify({
+            extensionId,
+            content: value
+        });
+        return this.credentialsService.setPassword(fullKey, key, passwordData);
+    }
+
+    async $deletePassword(extensionId: string, key: string): Promise<void> {
+        try {
+            const fullKey = SecretsMainImpl.getFullKey(extensionId);
+            await this.credentialsService.deletePassword(fullKey, key);
+        } catch (e) {
+            throw new Error('Cannot delete password');
+        }
+    }
+}

package/src/main/browser/selection-provider-command.ts

@@ -1,45 +1,45 @@
-// *****************************************************************************
-// Copyright (C) 2019 Red Hat, Inc. 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 { Command, CommandContribution, CommandRegistry } from '@theia/core/lib/common/command';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { UriAwareCommandHandler, UriCommandHandler } from '@theia/core/lib/common/uri-command-handler';
-import URI from '@theia/core/lib/common/uri';
-import { SelectionService } from '@theia/core';
-
-export namespace SelectionProviderCommands {
-    export const GET_SELECTED_CONTEXT: Command = {
-        id: 'theia.plugin.workspace.selectedContext'
-    };
-}
-
-@injectable()
-export class SelectionProviderCommandContribution implements CommandContribution {
-
-    @inject(SelectionService) protected readonly selectionService: SelectionService;
-
-    registerCommands(commands: CommandRegistry): void {
-        commands.registerCommand(SelectionProviderCommands.GET_SELECTED_CONTEXT, this.newMultiUriAwareCommandHandler({
-            isEnabled: () => true,
-            isVisible: () => false,
-            execute: (selectedUris: URI[]) => selectedUris.map(uri => uri.toComponents())
-        }));
-    }
-
-    protected newMultiUriAwareCommandHandler(handler: UriCommandHandler<URI[]>): UriAwareCommandHandler<URI[]> {
-        return UriAwareCommandHandler.MultiSelect(this.selectionService, handler);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 Red Hat, Inc. 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 { Command, CommandContribution, CommandRegistry } from '@theia/core/lib/common/command';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { UriAwareCommandHandler, UriCommandHandler } from '@theia/core/lib/common/uri-command-handler';
+import URI from '@theia/core/lib/common/uri';
+import { SelectionService } from '@theia/core';
+
+export namespace SelectionProviderCommands {
+    export const GET_SELECTED_CONTEXT: Command = {
+        id: 'theia.plugin.workspace.selectedContext'
+    };
+}
+
+@injectable()
+export class SelectionProviderCommandContribution implements CommandContribution {
+
+    @inject(SelectionService) protected readonly selectionService: SelectionService;
+
+    registerCommands(commands: CommandRegistry): void {
+        commands.registerCommand(SelectionProviderCommands.GET_SELECTED_CONTEXT, this.newMultiUriAwareCommandHandler({
+            isEnabled: () => true,
+            isVisible: () => false,
+            execute: (selectedUris: URI[]) => selectedUris.map(uri => uri.toComponents())
+        }));
+    }
+
+    protected newMultiUriAwareCommandHandler(handler: UriCommandHandler<URI[]>): UriAwareCommandHandler<URI[]> {
+        return UriAwareCommandHandler.MultiSelect(this.selectionService, handler);
+    }
+}

package/src/main/browser/status-bar-message-registry-main.ts

@@ -1,90 +1,90 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. 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 { interfaces } from '@theia/core/shared/inversify';
-import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
-import * as types from '../../plugin/types-impl';
-import { StatusBarMessageRegistryMain } from '../../common/plugin-api-rpc';
-import { StatusBar, StatusBarAlignment, StatusBarEntry } from '@theia/core/lib/browser/status-bar/status-bar';
-import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
-import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
-
-export class StatusBarMessageRegistryMainImpl implements StatusBarMessageRegistryMain, Disposable {
-    private readonly delegate: StatusBar;
-    private readonly entries = new Map<string, StatusBarEntry>();
-    private readonly toDispose = new DisposableCollection(
-        Disposable.create(() => { /* mark as not disposed */ })
-    );
-
-    protected readonly colorRegistry: ColorRegistry;
-
-    constructor(container: interfaces.Container) {
-        this.delegate = container.get(StatusBar);
-        this.colorRegistry = container.get(ColorRegistry);
-    }
-
-    dispose(): void {
-        this.toDispose.dispose();
-    }
-
-    async $setMessage(id: string,
-        name: string | undefined,
-        text: string | undefined,
-        priority: number,
-        alignment: number,
-        color: string | undefined,
-        backgroundColor: string | undefined,
-        tooltip: string | MarkdownString | undefined,
-        command: string | undefined,
-        accessibilityInformation: types.AccessibilityInformation,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        args: any[] | undefined): Promise<void> {
-        const ariaLabel = accessibilityInformation?.label;
-        const role = accessibilityInformation?.role;
-
-        const entry = {
-            name,
-            text: text || '',
-            ariaLabel,
-            role,
-            priority,
-            alignment: alignment === types.StatusBarAlignment.Left ? StatusBarAlignment.LEFT : StatusBarAlignment.RIGHT,
-            color: color && (this.colorRegistry.getCurrentColor(color) || color),
-            // In contrast to color, the backgroundColor must be a theme color. Thus, do not hand in the plain string if it cannot be resolved.
-            backgroundColor: backgroundColor && (this.colorRegistry.getCurrentColor(backgroundColor)),
-            tooltip,
-            command,
-            accessibilityInformation,
-            args
-        };
-
-        this.entries.set(id, entry);
-        await this.delegate.setElement(id, entry);
-        if (this.toDispose.disposed) {
-            this.$dispose(id);
-        } else {
-            this.toDispose.push(Disposable.create(() => this.$dispose(id)));
-        }
-    }
-
-    $dispose(id: string): void {
-        const entry = this.entries.get(id);
-        if (entry) {
-            this.entries.delete(id);
-            this.delegate.removeElement(id);
-        }
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. 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 { interfaces } from '@theia/core/shared/inversify';
+import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
+import * as types from '../../plugin/types-impl';
+import { StatusBarMessageRegistryMain } from '../../common/plugin-api-rpc';
+import { StatusBar, StatusBarAlignment, StatusBarEntry } from '@theia/core/lib/browser/status-bar/status-bar';
+import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
+
+export class StatusBarMessageRegistryMainImpl implements StatusBarMessageRegistryMain, Disposable {
+    private readonly delegate: StatusBar;
+    private readonly entries = new Map<string, StatusBarEntry>();
+    private readonly toDispose = new DisposableCollection(
+        Disposable.create(() => { /* mark as not disposed */ })
+    );
+
+    protected readonly colorRegistry: ColorRegistry;
+
+    constructor(container: interfaces.Container) {
+        this.delegate = container.get(StatusBar);
+        this.colorRegistry = container.get(ColorRegistry);
+    }
+
+    dispose(): void {
+        this.toDispose.dispose();
+    }
+
+    async $setMessage(id: string,
+        name: string | undefined,
+        text: string | undefined,
+        priority: number,
+        alignment: number,
+        color: string | undefined,
+        backgroundColor: string | undefined,
+        tooltip: string | MarkdownString | undefined,
+        command: string | undefined,
+        accessibilityInformation: types.AccessibilityInformation,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        args: any[] | undefined): Promise<void> {
+        const ariaLabel = accessibilityInformation?.label;
+        const role = accessibilityInformation?.role;
+
+        const entry = {
+            name,
+            text: text || '',
+            ariaLabel,
+            role,
+            priority,
+            alignment: alignment === types.StatusBarAlignment.Left ? StatusBarAlignment.LEFT : StatusBarAlignment.RIGHT,
+            color: color && (this.colorRegistry.getCurrentColor(color) || color),
+            // In contrast to color, the backgroundColor must be a theme color. Thus, do not hand in the plain string if it cannot be resolved.
+            backgroundColor: backgroundColor && (this.colorRegistry.getCurrentColor(backgroundColor)),
+            tooltip,
+            command,
+            accessibilityInformation,
+            args
+        };
+
+        this.entries.set(id, entry);
+        await this.delegate.setElement(id, entry);
+        if (this.toDispose.disposed) {
+            this.$dispose(id);
+        } else {
+            this.toDispose.push(Disposable.create(() => this.$dispose(id)));
+        }
+    }
+
+    $dispose(id: string): void {
+        const entry = this.entries.get(id);
+        if (entry) {
+            this.entries.delete(id);
+            this.delegate.removeElement(id);
+        }
+    }
+
+}