@theia/plugin-ext 1.29.0-next.4 → 1.29.0-next.41

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

@@ -21,7 +21,7 @@
 // code copied and modified from https://github.com/microsoft/vscode/blob/1.47.3/src/vs/workbench/api/browser/mainThreadAuthentication.ts
 
 import { interfaces } from '@theia/core/shared/inversify';
-import { AuthenticationExt, AuthenticationMain, PluginManagerExt, MAIN_RPC_CONTEXT } from '../../common/plugin-api-rpc';
+import { AuthenticationExt, AuthenticationMain, MAIN_RPC_CONTEXT } from '../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { Dialog, StorageService } from '@theia/core/lib/browser';
@@ -43,28 +43,17 @@ export class AuthenticationMainImpl implements AuthenticationMain {
     private readonly storageService: StorageService;
     private readonly authenticationService: AuthenticationService;
     private readonly quickPickService: QuickPickService;
-    private readonly extensionService: PluginManagerExt;
     constructor(rpc: RPCProtocol, container: interfaces.Container) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.AUTHENTICATION_EXT);
         this.messageService = container.get(MessageService);
         this.storageService = container.get(StorageService);
         this.authenticationService = container.get(AuthenticationService);
         this.quickPickService = container.get(QuickPickService);
-        this.extensionService = rpc.getProxy(MAIN_RPC_CONTEXT.HOSTED_PLUGIN_MANAGER_EXT);
 
         this.authenticationService.onDidChangeSessions(e => {
-            this.proxy.$onDidChangeAuthenticationSessions(e.providerId, e.label);
-        });
-        this.authenticationService.onDidRegisterAuthenticationProvider(info => {
-            this.proxy.$onDidChangeAuthenticationProviders([info], []);
-        });
-        this.authenticationService.onDidUnregisterAuthenticationProvider(providerId => {
-            this.proxy.$onDidChangeAuthenticationProviders([], [providerId]);
+            this.proxy.$onDidChangeAuthenticationSessions({ id: e.providerId, label: e.label });
         });
     }
-    $getProviderIds(): Promise<string[]> {
-        return Promise.resolve(this.authenticationService.getProviderIds());
-    }
 
     async $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean): Promise<void> {
         const provider = new AuthenticationProviderImpl(this.proxy, id, label, supportsMultipleAccounts, this.storageService, this.messageService);
@@ -230,15 +219,7 @@ export class AuthenticationMainImpl implements AuthenticationMain {
         this.storageService.setData(`authentication-session-${extensionName}-${providerId}`, sessionId);
     }
 
-    $ensureProvider(id: string): Promise<void> {
-        return this.extensionService.$activateByEvent(getAuthenticationProviderActivationEvent(id));
-    }
-
-    $removeSession(providerId: string, sessionId: string): Promise<void> {
-        return this.authenticationService.logout(providerId, sessionId);
-    }
-
-    $sendDidChangeSessions(providerId: string, event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): void {
+    $onDidChangeSessions(providerId: string, event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): void {
         this.authenticationService.updateSessions(providerId, event);
     }
 }
@@ -272,8 +253,10 @@ interface AccountUsage {
 }
 
 export class AuthenticationProviderImpl implements AuthenticationProvider {
-    private accounts = new Map<string, string[]>(); // Map account name to session ids
-    private sessions = new Map<string, string>(); // Map account id to name
+    /** map from account name to session ids */
+    private accounts = new Map<string, string[]>();
+    /** map from session id to account name */
+    private sessions = new Map<string, string>();
 
     readonly onDidChangeSessions: theia.Event<theia.AuthenticationProviderAuthenticationSessionsChangeEvent>;
 
@@ -313,7 +296,7 @@ export class AuthenticationProviderImpl implements AuthenticationProvider {
             Dialog.CANCEL);
 
         if (result && result === nls.localizeByDefault('Sign Out') && sessionsForAccount) {
-            sessionsForAccount.forEach(sessionId => this.logout(sessionId));
+            sessionsForAccount.forEach(sessionId => this.removeSession(sessionId));
             removeAccountUsage(this.storageService, this.id, accountName);
         }
     }
@@ -325,10 +308,10 @@ export class AuthenticationProviderImpl implements AuthenticationProvider {
     async updateSessionItems(event: theia.AuthenticationProviderAuthenticationSessionsChangeEvent): Promise<void> {
         const { added, removed } = event;
         const session = await this.proxy.$getSessions(this.id);
-        const addedSessions = session.filter(s => added.some(addedSession => this.getSessionId(addedSession) === s.id));
+        const addedSessions = added ? session.filter(s => added.some(addedSession => addedSession.id === s.id)) : [];
 
-        removed.forEach(removedSession => {
-            const sessionId = this.getSessionId(removedSession);
+        removed?.forEach(removedSession => {
+            const sessionId = removedSession.id;
             if (sessionId) {
                 const accountName = this.sessions.get(sessionId);
                 if (accountName) {
@@ -347,29 +330,21 @@ export class AuthenticationProviderImpl implements AuthenticationProvider {
         addedSessions.forEach(s => this.registerSession(s));
     }
 
-    login(scopes: string[]): Promise<theia.AuthenticationSession> {
-        return this.proxy.$createSession(this.id, scopes);
+    async login(scopes: string[]): Promise<theia.AuthenticationSession> {
+        return this.createSession(scopes);
     }
 
     async logout(sessionId: string): Promise<void> {
-        await this.proxy.$removeSession(this.id, sessionId);
-        this.messageService.info('Successfully signed out.');
+        return this.removeSession(sessionId);
     }
 
     createSession(scopes: string[]): Thenable<theia.AuthenticationSession> {
-        return this.login(scopes);
+        return this.proxy.$createSession(this.id, scopes);
     }
 
     removeSession(sessionId: string): Thenable<void> {
-        return this.logout(sessionId);
-    }
-
-    // utility method to be backwards compatible with the old AuthenticationProviderAuthenticationSessionsChangeEvent containing only the session id string
-    private getSessionId(obj: string | theia.AuthenticationSession | undefined): string | undefined {
-        if (!obj || typeof obj === 'string') {
-            return obj;
-        }
-        return obj.id;
+        return this.proxy.$removeSession(this.id, sessionId)
+            .then(() => { this.messageService.info('Successfully signed out.'); });
     }
 }
 

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

@@ -22,7 +22,6 @@ import {
 } from '../../../common/plugin-api-rpc-model';
 import { CommentGlyphWidget } from './comment-glyph-widget';
 import { BaseWidget, DISABLED_CLASS } from '@theia/core/lib/browser';
-import * as ReactDOM from '@theia/core/shared/react-dom';
 import * as React from '@theia/core/shared/react';
 import { MouseTargetType } from '@theia/editor/lib/browser';
 import { CommentsService } from './comments-service';
@@ -36,6 +35,7 @@ import {
 import { CommentsContextKeyService } from './comments-context-key-service';
 import { RefObject } from '@theia/core/shared/react';
 import * as monaco from '@theia/monaco-editor-core';
+import { createRoot, Root } from '@theia/core/shared/react-dom/client';
 
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
@@ -50,6 +50,7 @@ export const COMMENT_TITLE: MenuPath = ['comment-title-menu'];
 export class CommentThreadWidget extends BaseWidget {
 
     protected readonly zoneWidget: MonacoEditorZoneWidget;
+    protected readonly containerNodeRoot: Root;
     protected readonly commentGlyphWidget: CommentGlyphWidget;
     protected readonly contextMenu: CompositeMenuNode;
     protected readonly commentFormRef: RefObject<CommentForm> = React.createRef<CommentForm>();
@@ -67,6 +68,7 @@ export class CommentThreadWidget extends BaseWidget {
     ) {
         super();
         this.toDispose.push(this.zoneWidget = new MonacoEditorZoneWidget(editor));
+        this.containerNodeRoot = createRoot(this.zoneWidget.containerNode);
         this.toDispose.push(this.commentGlyphWidget = new CommentGlyphWidget(editor));
         this.toDispose.push(this._commentThread.onDidChangeCollapsibleState(state => {
             if (state === CommentThreadCollapsibleState.Expanded && !this.isExpanded) {
@@ -255,7 +257,7 @@ export class CommentThreadWidget extends BaseWidget {
 
     protected render(): void {
         const headHeight = Math.ceil(this.zoneWidget.editor.getOption(monaco.editor.EditorOption.lineHeight) * 1.2);
-        ReactDOM.render(<div className={'review-widget'}>
+        this.containerNodeRoot.render(<div className={'review-widget'}>
             <div className={'head'} style={{ height: headHeight, lineHeight: `${headHeight}px` }}>
                 <div className={'review-title'}>
                     <span className={'filename'}>{this.getThreadLabel()}</span>
@@ -295,7 +297,7 @@ export class CommentThreadWidget extends BaseWidget {
                     ref={this.commentFormRef}
                 />
             </div>
-        </div>, this.zoneWidget.containerNode);
+        </div>);
     }
 }
 

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

@@ -55,6 +55,7 @@ import { 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';
 
 export class DebugMainImpl implements DebugMain, Disposable {
     private readonly debugExt: DebugExt;
@@ -294,29 +295,36 @@ export class DebugMainImpl implements DebugMain, Disposable {
     }
 
     async $startDebugging(folder: WorkspaceFolder | undefined, nameOrConfiguration: string | DebugConfiguration, options: DebugSessionOptions): Promise<boolean> {
-        let configuration: DebugConfiguration | undefined;
-
+        // search for matching options
+        let sessionOptions: TheiaDebugSessionOptions | undefined;
         if (typeof nameOrConfiguration === 'string') {
             for (const configOptions of this.configurationManager.all) {
-                if (configOptions.configuration.name === nameOrConfiguration) {
-                    configuration = configOptions.configuration;
+                if (configOptions.name === nameOrConfiguration) {
+                    sessionOptions = configOptions;
                 }
             }
         } else {
-            configuration = nameOrConfiguration;
+            sessionOptions = {
+                name: nameOrConfiguration.name,
+                configuration: nameOrConfiguration
+            };
         }
 
-        if (!configuration) {
+        if (!sessionOptions) {
             console.error(`There is no debug configuration for ${nameOrConfiguration}`);
             return false;
         }
 
-        const debugConfiguration = { ...configuration, ...options };
-        const session = await this.sessionManager.start({
-            configuration: debugConfiguration,
-            workspaceFolderUri: folder && Uri.revive(folder.uri).toString()
-        });
+        // translate given extra data
+        const workspaceFolderUri = folder && Uri.revive(folder.uri).toString();
+        if (TheiaDebugSessionOptions.isConfiguration(sessionOptions)) {
+            sessionOptions = { ...sessionOptions, configuration: { ...sessionOptions.configuration, ...options }, workspaceFolderUri };
+        } else {
+            sessionOptions = { ...sessionOptions, ...options, workspaceFolderUri };
+        }
 
+        // start options
+        const session = await this.sessionManager.start(sessionOptions);
         return !!session;
     }
 

package/src/main/browser/debug/plugin-debug-session-factory.ts

@@ -22,7 +22,7 @@ import { LabelProvider } from '@theia/core/lib/browser/label-provider';
 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/browser/debug-preferences';
-import { DebugSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
+import { DebugConfigurationSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
 import { DebugSession } from '@theia/debug/lib/browser/debug-session';
 import { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';
 import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
@@ -36,7 +36,7 @@ import { PluginChannel } from '../../../common/connection';
 export class PluginDebugSession extends DebugSession {
     constructor(
         override readonly id: string,
-        override readonly options: DebugSessionOptions,
+        override readonly options: DebugConfigurationSessionOptions,
         override readonly parentSession: DebugSession | undefined,
         protected override readonly connection: DebugSessionConnection,
         protected override readonly terminalServer: TerminalService,
@@ -80,7 +80,7 @@ export class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
         super();
     }
 
-    override get(sessionId: string, options: DebugSessionOptions, parentSession?: DebugSession): DebugSession {
+    override get(sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
         const connection = new DebugSessionConnection(
             sessionId,
             this.connectionFactory,

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

@@ -66,6 +66,9 @@ import * as MonacoPath from '@theia/monaco-editor-core/esm/vs/base/common/path';
 import { IRelativePattern } from '@theia/monaco-editor-core/esm/vs/base/common/glob';
 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';
+import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
+import { EvaluatableExpression, EvaluatableExpressionProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
+import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
 
 /**
  * @monaco-uplift The public API declares these functions as (languageId: string, service).
@@ -338,7 +341,26 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         return this.proxy.$provideHover(handle, model.uri, position, token);
     }
 
-    $registerDocumentHighlightProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
+    $registerEvaluatableExpressionProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
+        const languageSelector = this.toLanguageSelector(selector);
+        const evaluatableExpressionProvider = this.createEvaluatableExpressionProvider(handle);
+        this.register(handle,
+            (StandaloneServices.get(ILanguageFeaturesService).evaluatableExpressionProvider.register as RegistrationFunction<EvaluatableExpressionProvider>)
+                (languageSelector, evaluatableExpressionProvider));
+    }
+
+    protected createEvaluatableExpressionProvider(handle: number): EvaluatableExpressionProvider {
+        return {
+            provideEvaluatableExpression: (model, position, token) => this.provideEvaluatableExpression(handle, model, position, token)
+        };
+    }
+
+    protected provideEvaluatableExpression(handle: number, model: ITextModel, position: monaco.Position,
+        token: monaco.CancellationToken): monaco.languages.ProviderResult<EvaluatableExpression | undefined> {
+        return this.proxy.$provideEvaluatableExpression(handle, model.uri, position, token);
+    }
+
+    $registerDocumentHighlightProvider(handle: number, _pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
         const languageSelector = this.toLanguageSelector(selector);
         const documentHighlightProvider = this.createDocumentHighlightProvider(handle);
         this.register(handle, (monaco.languages.registerDocumentHighlightProvider as RegistrationFunction<monaco.languages.DocumentHighlightProvider>)

package/src/main/browser/plugin-ext-frontend-module.ts

@@ -79,6 +79,7 @@ import { AuthenticationService } from '@theia/core/lib/browser/authentication-se
 import { bindTreeViewDecoratorUtilities, TreeViewDecoratorService } from './view/tree-view-decorator-service';
 import { CodeEditorWidgetUtil } from './menus/vscode-theia-menu-mappings';
 import { PluginMenuCommandAdapter } from './menus/plugin-menu-command-adapter';
+import './theme-icon-override';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
 

package/src/main/browser/preference-registry-main.ts

@@ -70,11 +70,10 @@ export class PreferenceRegistryMainImpl implements PreferenceRegistryMain, Dispo
 
             const roots = workspaceService.tryGetRoots();
             const data = getPreferences(preferenceProviderProvider, roots);
-            const eventData: PreferenceChangeExt[] = [];
-            for (const preferenceName of Object.keys(changes)) {
-                const { newValue } = changes[preferenceName];
-                eventData.push({ preferenceName, newValue });
-            }
+            const eventData = Object.values(changes).map<PreferenceChangeExt>(({ scope, newValue, domain, preferenceName }) => {
+                const extScope = scope === PreferenceScope.User ? undefined : domain?.[0];
+                return { preferenceName, newValue, scope: extScope };
+            });
             this.proxy.$acceptConfigurationChanged(data, eventData);
         }));
     }
@@ -84,17 +83,19 @@ export class PreferenceRegistryMainImpl implements PreferenceRegistryMain, Dispo
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    async $updateConfigurationOption(target: boolean | ConfigurationTarget | undefined, key: string, value: any, resource?: string): Promise<void> {
-        const scope = this.parseConfigurationTarget(target);
-        await this.preferenceService.set(key, value, scope, resource);
+    async $updateConfigurationOption(target: boolean | ConfigurationTarget | undefined, key: string, value: any, resource?: string, withLanguageOverride?: boolean): Promise<void> {
+        const scope = this.parseConfigurationTarget(target, resource);
+        const effectiveKey = this.getEffectiveKey(key, scope, withLanguageOverride, resource);
+        await this.preferenceService.set(effectiveKey, value, scope, resource);
     }
 
-    async $removeConfigurationOption(target: boolean | ConfigurationTarget | undefined, key: string, resource?: string): Promise<void> {
-        const scope = this.parseConfigurationTarget(target);
-        await this.preferenceService.set(key, undefined, scope, resource);
+    async $removeConfigurationOption(target: boolean | ConfigurationTarget | undefined, key: string, resource?: string, withLanguageOverride?: boolean): Promise<void> {
+        const scope = this.parseConfigurationTarget(target, resource);
+        const effectiveKey = this.getEffectiveKey(key, scope, withLanguageOverride, resource);
+        await this.preferenceService.set(effectiveKey, undefined, scope, resource);
     }
 
-    private parseConfigurationTarget(target?: boolean | ConfigurationTarget): PreferenceScope | undefined {
+    private parseConfigurationTarget(target?: boolean | ConfigurationTarget, resource?: string): PreferenceScope {
         if (typeof target === 'boolean') {
             return target ? PreferenceScope.User : PreferenceScope.Workspace;
         }
@@ -106,9 +107,17 @@ export class PreferenceRegistryMainImpl implements PreferenceRegistryMain, Dispo
             case ConfigurationTarget.WorkspaceFolder:
                 return PreferenceScope.Folder;
             default:
-                // PreferenceService knows how to deal with undefined in VS Code compatible way
-                return undefined;
+                return resource ? PreferenceScope.Folder : PreferenceScope.Workspace;
         }
     }
 
+    // If the caller does not set `withLanguageOverride = true`, we have to check whether the setting exists with that override already.
+    protected getEffectiveKey(key: string, scope: PreferenceScope, withLanguageOverride?: boolean, resource?: string): string {
+        if (withLanguageOverride) { return key; }
+        const overridden = this.preferenceService.overriddenPreferenceName(key);
+        if (!overridden) { return key; }
+        const value = this.preferenceService.inspectInScope(key, scope, resource, withLanguageOverride);
+        return value === undefined ? overridden.preferenceName : key;
+    }
+
 }

package/src/main/browser/style/tree.css

@@ -18,6 +18,8 @@
     padding-right: var(--theia-ui-padding);
     -webkit-font-smoothing: antialiased;
     flex-shrink: 0;
+    padding-left: 6px;
+    margin-left: -6px;
 }
 
 .theia-tree-view-inline-action {

package/src/main/browser/theme-icon-override.ts

@@ -0,0 +1,221 @@
+// *****************************************************************************
+// 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
+
+// @monaco-uplift
+// Keep this up-to-date with the table at https://code.visualstudio.com/api/references/icons-in-labels#icon-listing
+const codeIconMap: Record<string, string> = {
+    'accounts-view-bar-icon': 'account',
+    'breakpoints-activate': 'activate-breakpoints',
+    'breakpoints-remove-all': 'close-all',
+    'breakpoints-view-icon': 'debug-alt',
+    'callhierarchy-incoming': 'call-incoming',
+    'callhierarchy-outgoing': 'call-outgoing',
+    'callstack-view-icon': 'debug-alt',
+    'callstack-view-session': 'bug',
+    'comments-view-icon': 'comment-discussion',
+    'debug-collapse-all': 'collapse-all',
+    'debug-configure': 'gear',
+    'debug-console-clear-all': 'clear-all',
+    'debug-console-evaluation-input': 'arrow-small-right',
+    'debug-console-evaluation-prompt': 'chevron-right',
+    'debug-console-view-icon': 'debug-console',
+    'debug-gripper': 'gripper',
+    'default-view-icon': 'window',
+    'diff-editor-next-change': 'arrow-down',
+    'diff-editor-previous-change': 'arrow-up',
+    'diff-editor-toggle-whitespace': 'whitespace',
+    'diff-insert': 'add',
+    'diff-remove': 'remove',
+    'diff-review-close': 'close',
+    'diff-review-insert': 'add',
+    'diff-review-remove': 'remove',
+    'explorer-view-icon': 'files',
+    'extensions-clear-search-results': 'clear-all',
+    'extensions-configure-recommended': 'pencil',
+    'extensions-filter': 'filter',
+    'extensions-info-message': 'info',
+    'extensions-install-count': 'cloud-download',
+    'extensions-install-local-in-remote': 'cloud-download',
+    'extensions-install-workspace-recommended': 'cloud-download',
+    'extensions-manage': 'gear',
+    'extensions-rating': 'star',
+    'extensions-refresh': 'refresh',
+    'extensions-remote': 'remote',
+    'extensions-star-empty': 'star-empty',
+    'extensions-star-full': 'star-full',
+    'extensions-star-half': 'star-half',
+    'extensions-sync-enabled': 'sync',
+    'extensions-sync-ignored': 'sync-ignored',
+    'extensions-view-icon': 'extensions',
+    'extensions-warning-message': 'warning',
+    'find-collapsed': 'chevron-right',
+    'find-expanded': 'chevron-down',
+    'find-next-match': 'arrow-down',
+    'find-previous-match': 'arrow-up',
+    'find-replace': 'replace',
+    'find-replace-all': 'replace-all',
+    'find-selection': 'selection',
+    'folding-collapsed': 'chevron-right',
+    'folding-expanded': 'chevron-down',
+    'getting-started-beginner': 'lightbulb',
+    'getting-started-codespaces': 'github',
+    'getting-started-item-checked': 'pass-filled',
+    'getting-started-item-unchecked': 'circle-large-outline',
+    'getting-started-setup': 'heart',
+    'goto-next-location': 'arrow-down',
+    'goto-previous-location': 'arrow-up',
+    'keybindings-add': 'add',
+    'keybindings-edit': 'edit',
+    'keybindings-record-keys': 'record-keys',
+    'keybindings-sort': 'sort-precedence',
+    'loaded-scripts-view-icon': 'debug-alt',
+    'marker-navigation-next': 'chevron-down',
+    'marker-navigation-previous': 'chevron-up',
+    'markers-view-filter': 'filter',
+    'markers-view-icon': 'warning',
+    'markers-view-multi-line-collapsed': 'chevron-down',
+    'markers-view-multi-line-expanded': 'chevron-up',
+    'notebook-clear': 'clear-all',
+    'notebook-collapsed': 'chevron-right',
+    'notebook-delete-cell': 'trash',
+    'notebook-edit': 'pencil',
+    'notebook-execute': 'play',
+    'notebook-execute-all': 'run-all',
+    'notebook-expanded': 'chevron-down',
+    'notebook-kernel-configure': 'settings-gear',
+    'notebook-kernel-select': 'server-environment',
+    'notebook-mimetype': 'code',
+    'notebook-move-down': 'arrow-down',
+    'notebook-move-up': 'arrow-up',
+    'notebook-open-as-text': 'file-code',
+    'notebook-render-output': 'preview',
+    'notebook-revert': 'discard',
+    'notebook-split-cell': 'split-vertical',
+    'notebook-state-error': 'error',
+    'notebook-state-success': 'check',
+    'notebook-stop': 'primitive-square',
+    'notebook-stop-edit': 'check',
+    'notebook-unfold': 'unfold',
+    'notifications-clear': 'close',
+    'notifications-clear-all': 'clear-all',
+    'notifications-collapse': 'chevron-down',
+    'notifications-configure': 'gear',
+    'notifications-expand': 'chevron-up',
+    'notifications-hide': 'chevron-down',
+    'open-editors-view-icon': 'book',
+    'outline-view-icon': 'symbol-class',
+    'output-view-icon': 'output',
+    'panel-close': 'close',
+    'panel-maximize': 'chevron-up',
+    'panel-restore': 'chevron-down',
+    'parameter-hints-next': 'chevron-down',
+    'parameter-hints-previous': 'chevron-up',
+    'ports-forward-icon': 'plus',
+    'ports-open-browser-icon': 'globe',
+    'ports-stop-forward-icon': 'x',
+    'ports-view-icon': 'plug',
+    'preferences-clear-input': 'clear-all',
+    'preferences-open-settings': 'go-to-file',
+    'private-ports-view-icon': 'lock',
+    'public-ports-view-icon': 'eye',
+    'refactor-preview-view-icon': 'lightbulb',
+    'remote-explorer-documentation': 'book',
+    'remote-explorer-feedback': 'twitter',
+    'remote-explorer-get-started': 'star',
+    'remote-explorer-report-issues': 'comment',
+    'remote-explorer-review-issues': 'issues',
+    'remote-explorer-view-icon': 'remote-explorer',
+    'review-comment-collapse': 'chevron-up',
+    'run-view-icon': 'debug-alt',
+    'search-clear-results': 'clear-all',
+    'search-collapse-results': 'collapse-all',
+    'search-details': 'ellipsis',
+    'search-expand-results': 'expand-all',
+    'search-hide-replace': 'chevron-right',
+    'search-new-editor': 'new-file',
+    'search-refresh': 'refresh',
+    'search-remove': 'close',
+    'search-replace': 'replace',
+    'search-replace-all': 'replace-all',
+    'search-show-context': 'list-selection',
+    'search-show-replace': 'chevron-down',
+    'search-stop': 'search-stop',
+    'search-view-icon': 'search',
+    'settings-add': 'add',
+    'settings-discard': 'discard',
+    'settings-edit': 'edit',
+    'settings-folder-dropdown': 'triangle-down',
+    'settings-group-collapsed': 'chevron-right',
+    'settings-group-expanded': 'chevron-down',
+    'settings-more-action': 'gear',
+    'settings-remove': 'close',
+    'settings-sync-view-icon': 'sync',
+    'settings-view-bar-icon': 'settings-gear',
+    'source-control-view-icon': 'source-control',
+    'suggest-more-info': 'chevron-right',
+    'tasks-list-configure': 'gear',
+    'tasks-remove': 'close',
+    'terminal-kill': 'trash',
+    'terminal-new': 'add',
+    'terminal-rename': 'gear',
+    'terminal-view-icon': 'terminal',
+    'test-view-icon': 'beaker',
+    'testing-cancel-icon': 'close',
+    'testing-debug-icon': 'debug-alt',
+    'testing-error-icon': 'warning',
+    'testing-failed-icon': 'close',
+    'testing-passed-icon': 'pass',
+    'testing-queued-icon': 'watch',
+    'testing-run-all-icon': 'run-all',
+    'testing-run-icon': 'run',
+    'testing-show-as-list-icon': 'list-tree',
+    'testing-skipped-icon': 'debug-step-over',
+    'testing-unset-icon': 'circle-outline',
+    'timeline-open': 'history',
+    'timeline-pin': 'pin',
+    'timeline-refresh': 'refresh',
+    'timeline-unpin': 'pinned',
+    'timeline-view-icon': 'history',
+    'variables-view-icon': 'debug-alt',
+    'view-pane-container-collapsed': 'chevron-right',
+    'view-pane-container-expanded': 'chevron-down',
+    'watch-expressions-add': 'add',
+    'watch-expressions-add-function-breakpoint': 'add',
+    'watch-expressions-remove-all': 'close-all',
+    'watch-view-icon': 'debug-alt',
+    'widget-close': 'close'
+};
+
+const originalAsCSSSelector = ThemeIcon.asCSSSelector;
+const originalAsClassName = ThemeIcon.asClassName;
+const originalAsClassNameArray = ThemeIcon.asClassNameArray;
+
+function buildMappedIcon(icon: ThemeIcon): ThemeIcon {
+    const id = codeIconMap[icon.id] ?? icon.id;
+    const newIcon: ThemeIcon = {
+        ...icon,
+        id
+    };
+    return newIcon;
+}
+
+Object.assign(ThemeIcon, {
+    asCSSSelector: (icon: ThemeIcon) => originalAsCSSSelector(buildMappedIcon(icon)),
+    asClassName: (icon: ThemeIcon) => originalAsClassName(buildMappedIcon(icon)),
+    asClassNameArray: (icon: ThemeIcon) => originalAsClassNameArray(buildMappedIcon(icon))
+});

package/src/main/browser/view/plugin-view-registry.ts

@@ -490,7 +490,6 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         const currentDataWidget = widget.widgets[0];
         const viewDataWidget = await this.createViewDataWidget(view.id, webviewId);
         if (widget.isDisposed) {
-            // eslint-disable-next-line no-unused-expressions
             viewDataWidget?.dispose();
             return;
         }