@theia/plugin-ext 1.68.0-next.9 → 1.68.1

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

@@ -26,9 +26,10 @@ import {
     SourceControlGroupFeatures,
     ScmMain,
     SourceControlProviderFeatures,
-    ScmRawResourceSplices, ScmRawResourceGroup
+    ScmRawResourceSplices, ScmRawResourceGroup,
+    ScmActionButton as RpcScmActionButton
 } from '../../common/plugin-api-rpc';
-import { ScmProvider, ScmResource, ScmResourceDecorations, ScmResourceGroup, ScmCommand } from '@theia/scm/lib/browser/scm-provider';
+import { ScmProvider, ScmResource, ScmResourceDecorations, ScmResourceGroup, ScmCommand, ScmActionButton } from '@theia/scm/lib/browser/scm-provider';
 import { ScmRepository } from '@theia/scm/lib/browser/scm-repository';
 import { ScmService } from '@theia/scm/lib/browser/scm-service';
 import { RPCProtocol } from '../../common/rpc-protocol';
@@ -114,6 +115,9 @@ export class PluginScmProvider implements ScmProvider {
     private readonly onDidChangeResourcesEmitter = new Emitter<void>();
     readonly onDidChangeResources: Event<void> = this.onDidChangeResourcesEmitter.event;
 
+    private _actionButton: ScmActionButton | undefined;
+    get actionButton(): ScmActionButton | undefined { return this._actionButton; }
+
     private features: SourceControlProviderFeatures = {};
 
     get handle(): number { return this._handle; }
@@ -149,6 +153,9 @@ export class PluginScmProvider implements ScmProvider {
     private readonly onDidChangeEmitter = new Emitter<void>();
     readonly onDidChange: Event<void> = this.onDidChangeEmitter.event;
 
+    private readonly onDidChangeActionButtonEmitter = new Emitter<ScmActionButton | undefined>();
+    readonly onDidChangeActionButton: Event<ScmActionButton | undefined> = this.onDidChangeActionButtonEmitter.event;
+
     constructor(
         private readonly proxy: ScmExt,
         private readonly colors: ColorRegistry,
@@ -288,6 +295,11 @@ export class PluginScmProvider implements ScmProvider {
         this.groups.splice(this.groups.indexOf(group), 1);
     }
 
+    updateActionButton(actionButton: ScmActionButton | undefined): void {
+        this._actionButton = actionButton;
+        this.onDidChangeActionButtonEmitter.fire(actionButton);
+    }
+
     dispose(): void { }
 }
 
@@ -471,4 +483,36 @@ export class ScmMainImpl implements ScmMain {
 
         repository.input.enabled = enabled;
     }
+
+    $setActionButton(sourceControlHandle: number, actionButton: RpcScmActionButton | undefined): void {
+        const repository = this.repositories.get(sourceControlHandle);
+
+        if (!repository) {
+            return;
+        }
+
+        const provider = repository.provider as PluginScmProvider;
+
+        // Convert from RPC Command (with .id) to ScmCommand (with .command)
+        const converted: ScmActionButton | undefined = actionButton ? {
+            command: {
+                title: actionButton.command.title,
+                tooltip: actionButton.command.tooltip,
+                command: actionButton.command.id,
+                arguments: actionButton.command.arguments
+            },
+            secondaryCommands: actionButton.secondaryCommands?.map(row =>
+                row.map(cmd => ({
+                    title: cmd.title,
+                    tooltip: cmd.tooltip,
+                    command: cmd.id,
+                    arguments: cmd.arguments
+                }))
+            ),
+            enabled: actionButton.enabled,
+            description: actionButton.description
+        } : undefined;
+
+        provider.updateActionButton(converted);
+    }
 }

package/src/main/browser/webview/webview-resource-cache.ts

@@ -79,7 +79,7 @@ export class WebviewResourceCache {
             return;
         }
         const body = await response.body();
-        await cache.put(url, new Response(body, {
+        await cache.put(url, new Response(new Uint8Array(body), {
             status: 200,
             headers: { 'ETag': response.eTag }
         }));

package/src/main/browser/webview/webview.ts

@@ -24,11 +24,12 @@ import * as mime from 'mime';
 import { JSONExt } from '@theia/core/shared/@lumino/coreutils';
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import { WebviewPanelOptions, WebviewPortMapping } from '@theia/plugin';
-import { BaseWidget, Message } from '@theia/core/lib/browser/widgets/widget';
+import { BaseWidget, Message, codicon } from '@theia/core/lib/browser/widgets/widget';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { ApplicationShellMouseTracker } from '@theia/core/lib/browser/shell/application-shell-mouse-tracker';
 import { StatefulWidget } from '@theia/core/lib/browser/shell/shell-layout-restorer';
-import { WebviewPanelViewState } from '../../../common/plugin-api-rpc';
+import { WebviewPanelViewState, ThemeIcon as ThemeIconDTO } from '../../../common/plugin-api-rpc';
+import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 import { IconUrl } from '../../../common/plugin-protocol';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { WebviewEnvironment } from './webview-environment';
@@ -418,16 +419,18 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
         this.doUpdateContent();
     }
 
-    protected iconUrl: IconUrl | undefined;
+    protected iconUrl: IconUrl | ThemeIconDTO | undefined;
     protected readonly toDisposeOnIcon = new DisposableCollection();
-    setIconUrl(iconUrl: IconUrl | undefined): void {
-        if ((this.iconUrl && iconUrl && JSONExt.deepEqual(this.iconUrl, iconUrl)) || (this.iconUrl === iconUrl)) {
+    setIconUrl(iconUrl: IconUrl | ThemeIconDTO | undefined): void {
+        if (this.iconUrl === iconUrl || (this.iconUrl && iconUrl && JSON.stringify(this.iconUrl) === JSON.stringify(iconUrl))) {
             return;
         }
         this.toDisposeOnIcon.dispose();
         this.toDispose.push(this.toDisposeOnIcon);
         this.iconUrl = iconUrl;
-        if (iconUrl) {
+        if (ThemeIcon.isThemeIcon(iconUrl)) {
+            this.title.iconClass = codicon(iconUrl.id);
+        } else if (iconUrl) {
             const darkIconUrl = typeof iconUrl === 'object' ? iconUrl.dark : iconUrl;
             const lightIconUrl = typeof iconUrl === 'object' ? iconUrl.light : iconUrl;
             const iconClass = `webview-${this.identifier.id}-file-icon`;
@@ -678,7 +681,7 @@ export namespace WebviewWidget {
     export interface State {
         viewType: string
         title: string
-        iconUrl?: IconUrl
+        iconUrl?: IconUrl | ThemeIconDTO
         options: WebviewPanelOptions
         contentOptions: WebviewContentOptions
         state?: string

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

@@ -17,7 +17,7 @@
 import debounce = require('@theia/core/shared/lodash.debounce');
 import { URI } from '@theia/core/shared/vscode-uri';
 import { interfaces } from '@theia/core/shared/inversify';
-import { WebviewsMain, MAIN_RPC_CONTEXT, WebviewsExt, WebviewPanelViewState } from '../../common/plugin-api-rpc';
+import { WebviewsMain, MAIN_RPC_CONTEXT, WebviewsExt, WebviewPanelViewState, ThemeIcon } from '../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { WebviewOptions, WebviewPanelOptions, WebviewPanelShowOptions } from '@theia/plugin';
 import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
@@ -160,7 +160,7 @@ export class WebviewsMainImpl implements WebviewsMain, Disposable {
         webview.title.label = value;
     }
 
-    async $setIconPath(handle: string, iconUrl: IconUrl | undefined): Promise<void> {
+    async $setIconPath(handle: string, iconUrl: IconUrl | ThemeIcon | undefined): Promise<void> {
         const webview = await this.getWebview(handle);
         webview.setIconUrl(iconUrl);
     }

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

@@ -103,6 +103,13 @@ export class WorkspaceMainImpl implements WorkspaceMain, Disposable {
         }));
 
         this.workspaceTrustService.getWorkspaceTrust().then(trust => this.proxy.$onWorkspaceTrustChanged(trust));
+
+        // Subscribe to trust changes
+        this.toDispose.push(
+            this.workspaceTrustService.onDidChangeWorkspaceTrust(trust => {
+                this.proxy.$onWorkspaceTrustChanged(trust);
+            })
+        );
     }
 
     dispose(): void {

package/src/plugin/languages/hover.ts

@@ -18,19 +18,30 @@
 import { URI } from '@theia/core/shared/vscode-uri';
 import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from '../documents';
-import { Hover } from '../../common/plugin-api-rpc-model';
+import { Hover, HoverContext } from '../../common/plugin-api-rpc-model';
 import * as Converter from '../type-converters';
 import { Range } from '../types-impl';
-import { Position } from '../../common/plugin-api-rpc';
+import { HoverWithId, Position } from '../../common/plugin-api-rpc';
 
 export class HoverAdapter {
 
+    private _hoverCounter: number = 0;
+    private _hoverMap: Map<number, theia.Hover> = new Map<number, theia.Hover>();
+
+    private static HOVER_MAP_MAX_SIZE = 10;
+
     constructor(
         private readonly provider: theia.HoverProvider,
         private readonly documents: DocumentsExtImpl
     ) { }
 
-    public provideHover(resource: URI, position: Position, token: theia.CancellationToken): Promise<Hover | undefined> {
+    async provideHover(
+        resource: URI,
+        position: Position,
+        context: HoverContext<{ id: number }> | undefined,
+        token: theia.CancellationToken
+    ): Promise<HoverWithId | undefined> {
+
         const document = this.documents.getDocumentData(resource);
         if (!document) {
             return Promise.reject(new Error(`There are no document for ${resource}`));
@@ -39,20 +50,47 @@ export class HoverAdapter {
         const doc = document.document;
         const pos = Converter.toPosition(position);
 
-        return Promise.resolve(this.provider.provideHover(doc, pos, token)).then(value => {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            if (!value || !Array.isArray(value.contents) || (value.contents as Array<any>).length === 0) {
-                return undefined;
-            }
-            if (!value.range) {
-                value.range = doc.getWordRangeAtPosition(pos);
-            }
-            if (!value.range) {
-                value.range = new Range(pos, pos);
+        let value: theia.Hover | null | undefined;
+        if (context && context.verbosityRequest) {
+            const previousHoverId = context.verbosityRequest.previousHover.id;
+            const previousHover = this._hoverMap.get(previousHoverId);
+            if (!previousHover) {
+                throw new Error(`Hover with id ${previousHoverId} not found`);
             }
+            const hoverContext: theia.HoverContext = { verbosityDelta: context.verbosityRequest.verbosityDelta, previousHover };
+            value = await this.provider.provideHover(doc, pos, token, hoverContext);
+        } else {
+            value = await this.provider.provideHover(doc, pos, token);
+        }
+
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        if (!value || !Array.isArray(value.contents) || (value.contents as Array<any>).length === 0) {
+            return undefined;
+        }
+        if (!value.range) {
+            value.range = doc.getWordRangeAtPosition(pos);
+        }
+        if (!value.range) {
+            value.range = new Range(pos, pos);
+        }
+
+        const convertedHover: Hover = Converter.fromHover(value);
+        // Check if hover map has more than 10 elements and if yes, remove oldest from the map
+        if (this._hoverMap.size === HoverAdapter.HOVER_MAP_MAX_SIZE) {
+            const minimumId = Math.min(...this._hoverMap.keys());
+            this._hoverMap.delete(minimumId);
+        }
+        const id = this._hoverCounter++;
+        this._hoverMap.set(id, value);
+        const hover: HoverWithId = {
+            ...convertedHover,
+            id
+        };
+        return hover;
+    }
 
-            return Converter.fromHover(value);
-        });
+    releaseHover(id: number): void {
+        this._hoverMap.delete(id);
     }
 
 }

package/src/plugin/languages.ts

@@ -28,6 +28,7 @@ import {
     InlayHintsDto,
     InlayHintDto,
     IdentifiableInlineCompletions,
+    HoverWithId,
 } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
 import * as theia from '@theia/plugin';
@@ -42,7 +43,6 @@ import {
     Completion,
     SerializedDocumentFilter,
     SignatureHelp,
-    Hover,
     DocumentHighlight,
     Range,
     TextEdit,
@@ -71,7 +71,8 @@ import {
     TypeHierarchyItem,
     InlineCompletionContext,
     DocumentDropEdit,
-    DataTransferDTO
+    DataTransferDTO,
+    HoverContext
 } from '../common/plugin-api-rpc-model';
 import { CompletionAdapter } from './languages/completion';
 import { Diagnostics } from './languages/diagnostics';
@@ -412,8 +413,13 @@ export class LanguagesExtImpl implements LanguagesExt {
         return this.createDisposable(callId);
     }
 
-    $provideHover(handle: number, resource: UriComponents, position: Position, token: theia.CancellationToken): Promise<Hover | undefined> {
-        return this.withAdapter(handle, HoverAdapter, adapter => adapter.provideHover(URI.revive(resource), position, token), undefined);
+    $provideHover(handle: number, resource: UriComponents, position: Position, context: HoverContext<{ id: number }> | undefined,
+        token: theia.CancellationToken): Promise<HoverWithId | undefined> {
+        return this.withAdapter(handle, HoverAdapter, adapter => adapter.provideHover(URI.revive(resource), position, context, token), undefined);
+    }
+
+    $releaseHover(handle: number, id: number): void {
+        this.withAdapter(handle, HoverAdapter, adapter => Promise.resolve(adapter.releaseHover(id)), undefined);
     }
     // ### Hover Provider end
 

package/src/plugin/plugin-context.ts

@@ -80,6 +80,8 @@ import {
     SignatureHelp,
     SignatureHelpTriggerKind,
     Hover,
+    VerboseHover,
+    HoverVerbosityAction,
     EvaluatableExpression,
     InlineValueEvaluatableExpression,
     InlineValueText,
@@ -894,6 +896,9 @@ export function createAPIFactory(
             get onDidGrantWorkspaceTrust(): theia.Event<void> {
                 return workspaceExt.onDidGrantWorkspaceTrust;
             },
+            get onDidChangeWorkspaceTrust(): theia.Event<boolean> {
+                return workspaceExt.onDidChangeWorkspaceTrust;
+            },
             registerEditSessionIdentityProvider(scheme: string, provider: theia.EditSessionIdentityProvider) {
                 return workspaceExt.$registerEditSessionIdentityProvider(scheme, provider);
             },
@@ -1461,6 +1466,8 @@ export function createAPIFactory(
             SignatureHelp,
             SignatureHelpTriggerKind,
             Hover,
+            VerboseHover,
+            HoverVerbosityAction,
             EvaluatableExpression,
             InlineValueEvaluatableExpression,
             InlineValueText,

package/src/plugin/quick-open.ts

@@ -70,6 +70,7 @@ export class QuickOpenExtImpl implements QuickOpenExt {
             title: options && options.title,
             canPickMany: options && options.canPickMany,
             placeHolder: options && options.placeHolder,
+            prompt: options && options.prompt,
             matchOnDescription: options && options.matchOnDescription,
             matchOnDetail: options && options.matchOnDetail,
             ignoreFocusLost: options && options.ignoreFocusOut
@@ -256,6 +257,7 @@ export class QuickInputExt implements theia.QuickInput {
     private _totalSteps: number | undefined;
     private _value: string;
     private _placeholder: string | undefined;
+    private _prompt: string | undefined;
     private _buttons: theia.QuickInputButton[] = [];
     private _handlesToButtons = new Map<number, theia.QuickInputButton>();
     protected expectingHide = false;
@@ -364,6 +366,15 @@ export class QuickInputExt implements theia.QuickInput {
         this.update({ placeholder });
     }
 
+    get prompt(): string | undefined {
+        return this._prompt;
+    }
+
+    set prompt(prompt: string | undefined) {
+        this._prompt = prompt;
+        this.update({ prompt });
+    }
+
     get buttons(): theia.QuickInputButton[] {
         return this._buttons;
     }
@@ -505,7 +516,6 @@ export class QuickInputExt implements theia.QuickInput {
 export class InputBoxExt extends QuickInputExt implements theia.InputBox {
 
     private _password: boolean;
-    private _prompt: string | undefined;
     private _valueSelection: readonly [number, number] | undefined;
     private _validationMessage: string | undefined;
 
@@ -531,15 +541,6 @@ export class InputBoxExt extends QuickInputExt implements theia.InputBox {
         this.update({ password });
     }
 
-    get prompt(): string | undefined {
-        return this._prompt;
-    }
-
-    set prompt(prompt: string | undefined) {
-        this._prompt = prompt;
-        this.update({ prompt });
-    }
-
     get valueSelection(): readonly [number, number] | undefined {
         return this._valueSelection;
     }

package/src/plugin/scm.ts

@@ -27,7 +27,8 @@ import {
     ScmExt,
     ScmMain, ScmRawResource, ScmRawResourceGroup,
     ScmRawResourceSplice, ScmRawResourceSplices,
-    SourceControlGroupFeatures
+    SourceControlGroupFeatures,
+    ScmActionButton
 } from '../common';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { CommandRegistryImpl } from '../plugin/command-registry';
@@ -40,6 +41,7 @@ import { ScmCommandArg } from '../common/plugin-api-rpc';
 import { sep } from '@theia/core/lib/common/paths';
 import { PluginIconPath } from './plugin-icon-path';
 import { createAPIObject } from './plugin-context';
+
 type ProviderHandle = number;
 type GroupHandle = number;
 type ResourceStateHandle = number;
@@ -632,6 +634,39 @@ class SourceControlImpl implements theia.SourceControl {
         this.proxy.$updateSourceControl(this.handle, { statusBarCommands: internal });
     }
 
+    private _actionButtonDisposables = new DisposableCollection();
+    private _actionButton: theia.ScmActionButton | undefined = undefined;
+
+    get actionButton(): theia.ScmActionButton | undefined {
+        return this._actionButton;
+    }
+
+    set actionButton(actionButton: theia.ScmActionButton | undefined) {
+        this._actionButtonDisposables.dispose();
+        this._actionButtonDisposables = new DisposableCollection();
+        this._actionButton = actionButton;
+
+        if (actionButton) {
+            const command: Command = this.commands.converter.toSafeCommand(actionButton.command, this._actionButtonDisposables);
+            const secondaryCommands = actionButton.secondaryCommands?.map(row =>
+                row.map(cmd => {
+                    const safeCommand = this.commands.converter.toSafeCommand(cmd, this._actionButtonDisposables);
+                    return safeCommand;
+                })
+            );
+
+            const internal: ScmActionButton = {
+                command,
+                secondaryCommands: secondaryCommands,
+                enabled: actionButton.enabled,
+                description: actionButton.description
+            };
+            this.proxy.$setActionButton(this.handle, internal);
+        } else {
+            this.proxy.$setActionButton(this.handle, undefined);
+        }
+    }
+
     private _selected: boolean = false;
 
     get selected(): boolean {
@@ -741,6 +776,7 @@ class SourceControlImpl implements theia.SourceControl {
     dispose(): void {
         this.acceptInputDisposables.dispose();
         this._statusBarDisposables.dispose();
+        this._actionButtonDisposables.dispose();
 
         this.groups.forEach(group => group.dispose());
         this.proxy.$unregisterSourceControl(this.handle);

package/src/plugin/status-bar/status-bar-item.ts

@@ -26,7 +26,10 @@ export class StatusBarItemImpl implements theia.StatusBarItem {
     /** Map from allowed background colors to corresponding foreground colors. */
     private static BACKGROUND_COLORS = new Map<string, string>([
         ['statusBarItem.errorBackground', 'statusBarItem.errorForeground'],
-        ['statusBarItem.warningBackground', 'statusBarItem.warningForeground']
+        ['statusBarItem.warningBackground', 'statusBarItem.warningForeground'],
+        ['statusBarItem.prominentBackground', 'statusBarItem.prominentForeground'],
+        ['statusBarItem.remoteBackground', 'statusBarItem.remoteForeground'],
+        ['statusBarItem.offlineBackground', 'statusBarItem.offlineForeground']
     ]);
 
     private _id: string;

package/src/plugin/type-converters.ts

@@ -425,11 +425,14 @@ function convertTags(tags: types.DiagnosticTag[] | undefined): types.MarkerTag[]
     return markerTags;
 }
 
-export function fromHover(hover: theia.Hover): model.Hover {
-    return <model.Hover>{
+export function fromHover(hover: theia.VerboseHover): model.Hover {
+    const modelHover: model.Hover = {
         range: fromRange(hover.range),
-        contents: fromManyMarkdown(hover.contents)
+        contents: fromManyMarkdown(hover.contents),
+        canIncreaseVerbosity: hover.canIncreaseVerbosity,
+        canDecreaseVerbosity: hover.canDecreaseVerbosity,
     };
+    return modelHover;
 }
 
 export function fromEvaluatableExpression(evaluatableExpression: theia.EvaluatableExpression): model.EvaluatableExpression {
@@ -1327,7 +1330,7 @@ export function convertToTransferQuickPickItems(plugin: Plugin, items: (theia.Qu
         } else if (item.kind === QuickPickItemKind.Separator) {
             return { kind: 'separator', label: item.label, handle: index };
         } else {
-            const { label, description, iconPath, detail, picked, alwaysShow, buttons } = item;
+            const { label, description, iconPath, detail, picked, alwaysShow, buttons, resourceUri } = item;
             return {
                 kind: 'item',
                 label,
@@ -1337,6 +1340,7 @@ export function convertToTransferQuickPickItems(plugin: Plugin, items: (theia.Qu
                 picked,
                 alwaysShow,
                 buttons: buttons ? buttons.map((button, i) => convertQuickInputButton(plugin, button, i)) : undefined,
+                resourceUri: resourceUri?.toJSON(),
                 handle: index,
             };
         }

package/src/plugin/types-impl.ts

@@ -1491,6 +1491,29 @@ export class Hover {
     }
 }
 
+@es5ClassCompat
+export class VerboseHover extends Hover {
+
+    public canIncreaseVerbosity: boolean | undefined;
+    public canDecreaseVerbosity: boolean | undefined;
+
+    constructor(
+        contents: theia.MarkdownString | theia.MarkedString | (theia.MarkdownString | theia.MarkedString)[],
+        range?: Range,
+        canIncreaseVerbosity?: boolean,
+        canDecreaseVerbosity?: boolean,
+    ) {
+        super(contents, range);
+        this.canIncreaseVerbosity = canIncreaseVerbosity;
+        this.canDecreaseVerbosity = canDecreaseVerbosity;
+    }
+}
+
+export enum HoverVerbosityAction {
+    Increase = 0,
+    Decrease = 1
+}
+
 @es5ClassCompat
 export class EvaluatableExpression {
 

package/src/plugin/webviews.ts

@@ -21,7 +21,7 @@ import * as theia from '@theia/plugin';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { fromViewColumn, toViewColumn, toWebviewPanelShowOptions } from './type-converters';
-import { Disposable, WebviewPanelTargetArea, URI } from './types-impl';
+import { Disposable, WebviewPanelTargetArea, URI, ThemeIcon } from './types-impl';
 import { WorkspaceExtImpl } from './workspace';
 import { PluginIconPath } from './plugin-icon-path';
 import { PluginModel, PluginPackage } from '../common';
@@ -315,7 +315,7 @@ export class WebviewPanelImpl implements theia.WebviewPanel {
     private _active = true;
     private _visible = true;
     private _showOptions: theia.WebviewPanelShowOptions;
-    private _iconPath: theia.Uri | { light: theia.Uri; dark: theia.Uri } | undefined;
+    private _iconPath: theia.IconPath | undefined;
 
     readonly onDisposeEmitter = new Emitter<void>();
     public readonly onDidDispose: Event<void> = this.onDisposeEmitter.event;
@@ -367,15 +367,19 @@ export class WebviewPanelImpl implements theia.WebviewPanel {
         }
     }
 
-    get iconPath(): theia.Uri | { light: theia.Uri; dark: theia.Uri } | undefined {
+    get iconPath(): theia.IconPath | undefined {
         return this._iconPath;
     }
 
-    set iconPath(iconPath: theia.Uri | { light: theia.Uri; dark: theia.Uri } | undefined) {
+    set iconPath(iconPath: theia.IconPath | undefined) {
         this.checkIsDisposed();
         if (this._iconPath !== iconPath) {
             this._iconPath = iconPath;
-            this.proxy.$setIconPath(this.viewId, PluginIconPath.toUrl(iconPath, this._webview.plugin));
+            if (ThemeIcon.is(iconPath)) {
+                this.proxy.$setIconPath(this.viewId, ThemeIcon.get(iconPath));
+            } else {
+                this.proxy.$setIconPath(this.viewId, PluginIconPath.toUrl(iconPath, this._webview.plugin));
+            }
         }
     }