@theia/plugin-ext 1.43.1 → 1.45.0

package/src/main/browser/notebooks/notebook-documents-and-editors-main.ts

@@ -23,7 +23,7 @@ import { interfaces } from '@theia/core/shared/inversify';
 import { UriComponents } from '@theia/core/lib/common/uri';
 import { NotebookEditorWidget, NotebookService, NotebookEditorWidgetService } from '@theia/notebook/lib/browser';
 import { NotebookModel } from '@theia/notebook/lib/browser/view-model/notebook-model';
-import { MAIN_RPC_CONTEXT, NotebookDocumentsAndEditorsDelta, NotebookDocumentsAndEditorsMain, NotebookModelAddedData, NotebooksExt } from '../../../common';
+import { MAIN_RPC_CONTEXT, NotebookDocumentsAndEditorsDelta, NotebookDocumentsAndEditorsMain, NotebookEditorAddData, NotebookModelAddedData, NotebooksExt } from '../../../common';
 import { RPCProtocol } from '../../../common/rpc-protocol';
 import { NotebookDto } from './notebook-dto';
 import { WidgetManager } from '@theia/core/lib/browser';
@@ -31,6 +31,7 @@ import { NotebookEditorsMainImpl } from './notebook-editors-main';
 import { NotebookDocumentsMainImpl } from './notebook-documents-main';
 import { diffMaps, diffSets } from '../../../common/collections';
 import { Mutex } from 'async-mutex';
+import throttle = require('@theia/core/shared/lodash.throttle');
 
 interface NotebookAndEditorDelta {
     removedDocuments: UriComponents[];
@@ -42,7 +43,7 @@ interface NotebookAndEditorDelta {
 }
 
 class NotebookAndEditorState {
-    static delta(before: NotebookAndEditorState | undefined, after: NotebookAndEditorState): NotebookAndEditorDelta {
+    static computeDelta(before: NotebookAndEditorState | undefined, after: NotebookAndEditorState): NotebookAndEditorDelta {
         if (!before) {
             return {
                 addedDocuments: [...after.documents],
@@ -106,12 +107,12 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
         this.notebookEditorService = container.get(NotebookEditorWidgetService);
         this.WidgetManager = container.get(WidgetManager);
 
-        this.notebookService.onDidAddNotebookDocument(async () => this.updateState(), this, this.disposables);
-        this.notebookService.onDidRemoveNotebookDocument(async () => this.updateState(), this, this.disposables);
+        this.notebookService.onDidAddNotebookDocument(async () => this.throttleStateUpdate(), this, this.disposables);
+        this.notebookService.onDidRemoveNotebookDocument(async () => this.throttleStateUpdate(), this, this.disposables);
         // this.WidgetManager.onActiveEditorChanged(() => this.updateState(), this, this.disposables);
         this.notebookEditorService.onDidAddNotebookEditor(async editor => this.handleEditorAdd(editor), this, this.disposables);
         this.notebookEditorService.onDidRemoveNotebookEditor(async editor => this.handleEditorRemove(editor), this, this.disposables);
-        this.notebookEditorService.onDidChangeFocusedEditor(async editor => this.updateState(editor), this, this.disposables);
+        this.notebookEditorService.onDidChangeFocusedEditor(async editor => this.throttleStateUpdate(editor), this, this.disposables);
     }
 
     dispose(): void {
@@ -129,16 +130,18 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
         } else {
             this.editorListeners.set(editor.id, [disposable]);
         }
-        await this.updateState();
+        await this.throttleStateUpdate();
     }
 
     private handleEditorRemove(editor: NotebookEditorWidget): void {
         const listeners = this.editorListeners.get(editor.id);
         listeners?.forEach(listener => listener.dispose());
         this.editorListeners.delete(editor.id);
-        this.updateState();
+        this.throttleStateUpdate();
     }
 
+    private throttleStateUpdate = throttle((focusedEditor?: NotebookEditorWidget) => this.updateState(focusedEditor), 100);
+
     private async updateState(focusedEditor?: NotebookEditorWidget): Promise<void> {
         await this.updateMutex.runExclusive(async () => this.doUpdateState(focusedEditor));
     }
@@ -148,10 +151,8 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
         const editors = new Map<string, NotebookEditorWidget>();
         const visibleEditorsMap = new Map<string, NotebookEditorWidget>();
 
-        for (const editor of this.notebookEditorService.listNotebookEditors()) {
-            if (editor.model) {
-                editors.set(editor.id, editor);
-            }
+        for (const editor of this.notebookEditorService.getNotebookEditors()) {
+            editors.set(editor.id, editor);
         }
 
         const activeNotebookEditor = this.notebookEditorService.focusedEditor;
@@ -167,7 +168,7 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
 
         const notebookEditors = this.WidgetManager.getWidgets(NotebookEditorWidget.ID) as NotebookEditorWidget[];
         for (const notebookEditor of notebookEditors) {
-            if (notebookEditor?.model && editors.has(notebookEditor.id) && notebookEditor.isVisible) {
+            if (editors.has(notebookEditor.id) && notebookEditor.isVisible) {
                 visibleEditorsMap.set(notebookEditor.id, notebookEditor);
             }
         }
@@ -176,12 +177,12 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
             new Set(this.notebookService.listNotebookDocuments()),
             editors,
             activeEditor, visibleEditorsMap);
-        await this.onDelta(NotebookAndEditorState.delta(this.currentState, newState));
+        await this.onDelta(NotebookAndEditorState.computeDelta(this.currentState, newState));
         this.currentState = newState;
     }
 
     private async onDelta(delta: NotebookAndEditorDelta): Promise<void> {
-        if (NotebooksAndEditorsMain._isDeltaEmpty(delta)) {
+        if (NotebooksAndEditorsMain.isDeltaEmpty(delta)) {
             return;
         }
 
@@ -191,7 +192,7 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
             newActiveEditor: delta.newActiveEditor,
             visibleEditors: delta.visibleEditors,
             addedDocuments: delta.addedDocuments.map(NotebooksAndEditorsMain.asModelAddData),
-            // addedEditors: delta.addedEditors.map(this.asEditorAddData, this),
+            addedEditors: delta.addedEditors.map(NotebooksAndEditorsMain.asEditorAddData),
         };
 
         // send to extension FIRST
@@ -204,23 +205,23 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
         this.notebookEditorsMain.handleEditorsAdded(delta.addedEditors);
     }
 
-    private static _isDeltaEmpty(delta: NotebookAndEditorDelta): boolean {
-        if (delta.addedDocuments !== undefined && delta.addedDocuments.length > 0) {
+    private static isDeltaEmpty(delta: NotebookAndEditorDelta): boolean {
+        if (delta.addedDocuments?.length) {
             return false;
         }
-        if (delta.removedDocuments !== undefined && delta.removedDocuments.length > 0) {
+        if (delta.removedDocuments?.length) {
             return false;
         }
-        if (delta.addedEditors !== undefined && delta.addedEditors.length > 0) {
+        if (delta.addedEditors?.length) {
             return false;
         }
-        if (delta.removedEditors !== undefined && delta.removedEditors.length > 0) {
+        if (delta.removedEditors?.length) {
             return false;
         }
-        if (delta.visibleEditors !== undefined && delta.visibleEditors.length > 0) {
+        if (delta.visibleEditors?.length) {
             return false;
         }
-        if (delta.newActiveEditor !== undefined) {
+        if (delta.newActiveEditor) {
             return false;
         }
         return true;
@@ -235,4 +236,17 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
             cells: e.cells.map(NotebookDto.toNotebookCellDto)
         };
     }
+
+    private static asEditorAddData(notebookEditor: NotebookEditorWidget): NotebookEditorAddData {
+        const uri = notebookEditor.getResourceUri();
+        if (!uri) {
+            throw new Error('Notebook editor without resource URI');
+        }
+        return {
+            id: notebookEditor.id,
+            documentUri: uri.toComponents(),
+            selections: [],
+            visibleRanges: []
+        };
+    }
 }

package/src/main/browser/notebooks/notebook-documents-main.ts

@@ -20,7 +20,7 @@ import { interfaces } from '@theia/core/shared/inversify';
 import { NotebookModelResolverService } from '@theia/notebook/lib/browser';
 import { NotebookModel } from '@theia/notebook/lib/browser/view-model/notebook-model';
 import { NotebookCellsChangeType } from '@theia/notebook/lib/common';
-import { MAIN_RPC_CONTEXT, NotebookCellDto, NotebookCellsChangedEventDto, NotebookDataDto, NotebookDocumentsExt, NotebookDocumentsMain } from '../../../common';
+import { MAIN_RPC_CONTEXT, NotebookCellsChangedEventDto, NotebookDataDto, NotebookDocumentsExt, NotebookDocumentsMain } from '../../../common';
 import { RPCProtocol } from '../../../common/rpc-protocol';
 import { NotebookDto } from './notebook-dto';
 
@@ -54,23 +54,22 @@ export class NotebookDocumentsMainImpl implements NotebookDocumentsMain {
 
     handleNotebooksAdded(notebooks: readonly NotebookModel[]): void {
 
-        for (const textModel of notebooks) {
-            const disposableStore = new DisposableCollection();
-            disposableStore.push(textModel.onDidChangeContent(event => {
+        for (const notebook of notebooks) {
+            const listener = notebook.onDidChangeContent(events => {
 
                 const eventDto: NotebookCellsChangedEventDto = {
                     versionId: 1, // TODO implement version ID support
                     rawEvents: []
                 };
 
-                for (const e of event.rawEvents) {
+                for (const e of events) {
 
                     switch (e.kind) {
                         case NotebookCellsChangeType.ModelChange:
                             eventDto.rawEvents.push({
                                 kind: e.kind,
                                 changes: e.changes.map(diff =>
-                                    [diff[0], diff[1], diff[2].map(NotebookDto.toNotebookCellDto)] as [number, number, NotebookCellDto[]])
+                                    ({ ...diff, newItems: diff.newItems.map(NotebookDto.toNotebookCellDto) }))
                             });
                             break;
                         case NotebookCellsChangeType.Move:
@@ -106,20 +105,20 @@ export class NotebookDocumentsMainImpl implements NotebookDocumentsMain {
                     }
                 }
 
-                const hasDocumentMetadataChangeEvent = event.rawEvents.find(e => e.kind === NotebookCellsChangeType.ChangeDocumentMetadata);
+                const hasDocumentMetadataChangeEvent = events.find(e => e.kind === NotebookCellsChangeType.ChangeDocumentMetadata);
 
                 // using the model resolver service to know if the model is dirty or not.
                 // assuming this is the first listener it can mean that at first the model
                 // is marked as dirty and that another event is fired
                 this.proxy.$acceptModelChanged(
-                    textModel.uri.toComponents(),
+                    notebook.uri.toComponents(),
                     eventDto,
-                    textModel.isDirty(),
-                    hasDocumentMetadataChangeEvent ? textModel.metadata : undefined
+                    notebook.isDirty(),
+                    hasDocumentMetadataChangeEvent ? notebook.metadata : undefined
                 );
-            }));
+            });
 
-            this.documentEventListenersMapping.set(textModel.uri.toString(), disposableStore);
+            this.documentEventListenersMapping.set(notebook.uri.toString(), new DisposableCollection(listener));
         }
     }
 

package/src/main/browser/notebooks/notebook-dto.ts

@@ -18,6 +18,8 @@ import { OS } from '@theia/core';
 import * as notebookCommon from '@theia/notebook/lib/common';
 import { NotebookCellModel } from '@theia/notebook/lib/browser/view-model/notebook-cell-model';
 import * as rpc from '../../../common';
+import { CellExecutionUpdateType } from '@theia/notebook/lib/common';
+import { CellExecuteUpdate, CellExecutionComplete } from '@theia/notebook/lib/browser';
 
 export namespace NotebookDto {
 
@@ -102,40 +104,28 @@ export namespace NotebookDto {
         };
     }
 
-    // export function fromCellExecuteUpdateDto(data: extHostProtocol.ICellExecuteUpdateDto): ICellExecuteUpdate {
-    //     if (data.editType === CellExecutionUpdateType.Output) {
-    //         return {
-    //             editType: data.editType,
-    //             cellHandle: data.cellHandle,
-    //             append: data.append,
-    //             outputs: data.outputs.map(fromNotebookOutputDto)
-    //         };
-    //     } else if (data.editType === CellExecutionUpdateType.OutputItems) {
-    //         return {
-    //             editType: data.editType,
-    //             append: data.append,
-    //             outputId: data.outputId,
-    //             items: data.items.map(fromNotebookOutputItemDto)
-    //         };
-    //     } else {
-    //         return data;
-    //     }
-    // }
+    export function fromCellExecuteUpdateDto(data: rpc.CellExecuteUpdateDto): CellExecuteUpdate {
+        if (data.editType === CellExecutionUpdateType.Output) {
+            return {
+                editType: data.editType,
+                cellHandle: data.cellHandle,
+                append: data.append,
+                outputs: data.outputs.map(fromNotebookOutputDto)
+            };
+        } else if (data.editType === CellExecutionUpdateType.OutputItems) {
+            return {
+                editType: data.editType,
+                outputId: data.outputId,
+                append: data.append,
+                items: data.items.map(fromNotebookOutputItemDto)
+            };
+        } else {
+            return data;
+        }
+    }
 
-    // export function fromCellExecuteCompleteDto(data: extHostProtocol.ICellExecutionCompleteDto): ICellExecutionComplete {
-    //     return data;
-    // }
+    export function fromCellExecuteCompleteDto(data: rpc.CellExecutionCompleteDto): CellExecutionComplete {
+        return data;
+    }
 
-    // export function fromCellEditOperationDto(edit: extHostProtocol.ICellEditOperationDto): notebookCommon.ICellEditOperation {
-    //     if (edit.editType === notebookCommon.CellEditType.Replace) {
-    //         return {
-    //             editType: edit.editType,
-    //             index: edit.index,
-    //             count: edit.count,
-    //             cells: edit.cells.map(fromNotebookCellDataDto)
-    //         };
-    //     } else {
-    //         return edit;
-    //     }
-    // }
 }

package/src/main/browser/notebooks/notebook-kernels-main.ts

@@ -27,7 +27,7 @@ import { CellExecution, NotebookExecutionStateService, NotebookKernelChangeEvent
 import { combinedDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
 import { interfaces } from '@theia/core/shared/inversify';
 import { NotebookKernelSourceAction } from '@theia/notebook/lib/common';
-import { NotebookDto } from '../../../plugin/type-converters';
+import { NotebookDto } from './notebook-dto';
 
 abstract class NotebookKernel {
     private readonly onDidChangeEmitter = new Emitter<NotebookKernelChangeEvent>();

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

@@ -14,9 +14,9 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { CancellationToken, DisposableCollection, Emitter } from '@theia/core';
+import { CancellationToken, DisposableCollection, Emitter, Event } from '@theia/core';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
-import { NotebookCellStatusBarItemList, NotebookCellStatusBarItemProvider, NotebookData, TransientOptions } from '@theia/notebook/lib/common';
+import { NotebookCellStatusBarItem, NotebookData, TransientOptions } from '@theia/notebook/lib/common';
 import { NotebookService } from '@theia/notebook/lib/browser';
 import { Disposable } from '@theia/plugin';
 import { MAIN_RPC_CONTEXT, NotebooksExt, NotebooksMain } from '../../../common';
@@ -25,6 +25,17 @@ import { NotebookDto } from './notebook-dto';
 import { UriComponents } from '@theia/core/lib/common/uri';
 import { HostedPluginSupport } from '../../../hosted/browser/hosted-plugin';
 
+export interface NotebookCellStatusBarItemList {
+    items: NotebookCellStatusBarItem[];
+    dispose?(): void;
+}
+
+export interface NotebookCellStatusBarItemProvider {
+    viewType: string;
+    onDidChangeStatusBarItems?: Event<void>;
+    provideCellStatusBarItems(uri: UriComponents, index: number, token: CancellationToken): Promise<NotebookCellStatusBarItemList | undefined>;
+}
+
 export class NotebooksMainImpl implements NotebooksMain {
 
     private readonly disposables = new DisposableCollection();

package/src/main/browser/notebooks/renderers/cell-output-webview.tsx

@@ -20,7 +20,7 @@
 
 import * as React from '@theia/core/shared/react';
 import { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify';
-import { NotebookRendererMessagingService, CellOutputWebview, NotebookRendererRegistry, NotebookEditorWidgetService } from '@theia/notebook/lib/browser';
+import { NotebookRendererMessagingService, CellOutputWebview, NotebookRendererRegistry, NotebookEditorWidgetService, NotebookCellOutputsSplice } from '@theia/notebook/lib/browser';
 import { v4 } from 'uuid';
 import { NotebookCellModel } from '@theia/notebook/lib/browser/view-model/notebook-cell-model';
 import { WebviewWidget } from '../../webview/webview';
@@ -28,7 +28,7 @@ import { Message, WidgetManager } from '@theia/core/lib/browser';
 import { outputWebviewPreload, PreloadContext } from './output-webview-internal';
 import { WorkspaceTrustService } from '@theia/workspace/lib/browser';
 import { ChangePreferredMimetypeMessage, FromWebviewMessage, OutputChangedMessage } from './webview-communication';
-import { CellUri, NotebookCellOutputsSplice } from '@theia/notebook/lib/common';
+import { CellUri } from '@theia/notebook/lib/common';
 import { Disposable, DisposableCollection, nls, QuickPickService } from '@theia/core';
 import { NotebookCellOutputModel } from '@theia/notebook/lib/browser/view-model/notebook-cell-output-model';
 
@@ -76,7 +76,7 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
     protected async init(): Promise<void> {
         this.cell.onDidChangeOutputs(outputChange => this.updateOutput(outputChange));
         this.cell.onDidChangeOutputItems(output => {
-            this.updateOutput({start: this.cell.outputs.findIndex(o => o.getData().outputId === o.outputId), deleteCount: 1, newOutputs: [output]});
+            this.updateOutput({start: this.cell.outputs.findIndex(o => o.outputId === output.outputId), deleteCount: 1, newOutputs: [output]});
         });
 
         this.webviewWidget = await this.widgetManager.getOrCreateWidget(WebviewWidget.FACTORY_ID, { id: this.id });

package/src/main/browser/plugin-contribution-handler.ts

@@ -53,6 +53,7 @@ import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
 import { PluginTerminalRegistry } from './plugin-terminal-registry';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
+import { LanguageService } from '@theia/core/lib/browser/language-service';
 
 @injectable()
 export class PluginContributionHandler {
@@ -89,6 +90,9 @@ export class PluginContributionHandler {
     @inject(CommandRegistry)
     protected readonly commands: CommandRegistry;
 
+    @inject(LanguageService)
+    protected readonly languageService: LanguageService;
+
     @inject(PluginSharedStyle)
     protected readonly style: PluginSharedStyle;
 
@@ -195,6 +199,11 @@ export class PluginContributionHandler {
                     firstLine: lang.firstLine,
                     mimetypes: lang.mimetypes
                 });
+                if (lang.icon) {
+                    const languageIcon = this.style.toFileIconClass(lang.icon);
+                    pushContribution(`language.${lang.id}.icon`, () => languageIcon);
+                    pushContribution(`language.${lang.id}.iconRegistration`, () => this.languageService.registerIcon(lang.id, languageIcon.object.iconClass));
+                }
                 const langConfiguration = lang.configuration;
                 if (langConfiguration) {
                     pushContribution(`language.${lang.id}.configuration`, () => monaco.languages.setLanguageConfiguration(lang.id, {

package/src/main/browser/plugin-icon-theme-service.ts

@@ -39,6 +39,8 @@ import { FileStat, FileChangeType } from '@theia/filesystem/lib/common/files';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
+import { LanguageService } from '@theia/core/lib/browser/language-service';
+import { DEFAULT_ICON_SIZE, PLUGIN_FILE_ICON_CLASS } from './plugin-shared-style';
 
 export interface PluginIconDefinition {
     iconPath: string;
@@ -79,6 +81,7 @@ export interface PluginIconThemeDocument extends PluginIconsAssociation {
     light?: PluginIconsAssociation;
     highContrast?: PluginIconsAssociation;
     hidesExplorerArrows?: boolean;
+    showLanguageModeIcons?: boolean;
 }
 
 export const PluginIconThemeFactory = Symbol('PluginIconThemeFactory');
@@ -96,8 +99,14 @@ export class PluginIconThemeDefinition implements IconThemeDefinition, IconTheme
     hasFileIcons?: boolean;
     hasFolderIcons?: boolean;
     hidesExplorerArrows?: boolean;
+    showLanguageModeIcons?: boolean;
 }
 
+class PluginLanguageIconInfo {
+    hasSpecificFileIcons: boolean = false;
+    coveredLanguages: { [languageId: string]: boolean } = {};
+};
+
 @injectable()
 export class PluginIconTheme extends PluginIconThemeDefinition implements IconTheme, Disposable {
 
@@ -113,6 +122,9 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
     @inject(WorkspaceService)
     protected readonly workspaceService: WorkspaceService;
 
+    @inject(LanguageService)
+    protected readonly languageService: LanguageService;
+
     protected readonly onDidChangeEmitter = new Emitter<DidChangeLabelEvent>();
     readonly onDidChange = this.onDidChangeEmitter.event;
 
@@ -240,17 +252,18 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
             selectors.push(selector + '::before');
             definitionSelectors.set(definitionId, selectors);
         };
-        this.collectSelectors(json, acceptSelector.bind(undefined, 'dark'));
+
+        let iconInfo = this.collectSelectors(json, acceptSelector.bind(undefined, 'dark'));
         if (json.light) {
-            this.collectSelectors(json.light, acceptSelector.bind(undefined, 'light'));
+            iconInfo = this.collectSelectors(json.light, acceptSelector.bind(undefined, 'light'));
         }
         if (json.highContrast) {
-            this.collectSelectors(json.highContrast, acceptSelector.bind(undefined, 'hc'));
+            iconInfo = this.collectSelectors(json.highContrast, acceptSelector.bind(undefined, 'hc'));
         }
 
-        if (!this.icons.size) {
-            return;
-        }
+        const showLanguageModeIcons = this.showLanguageModeIcons === true
+            || json.showLanguageModeIcons === true
+            || (iconInfo.hasSpecificFileIcons && json.showLanguageModeIcons !== false);
 
         const fonts = json.fonts;
         if (Array.isArray(fonts)) {
@@ -303,7 +316,7 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
                     this.styleSheetContent += `${selectors.join(', ')} {
     content: ' ';
     background-image: ${cssUrl};
-    background-size: 16px;
+    background-size: ${DEFAULT_ICON_SIZE}px;
     background-position: left center;
     background-repeat: no-repeat;
 }
@@ -327,6 +340,20 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
                 }
             }
         }
+
+        if (showLanguageModeIcons) {
+            for (const language of this.languageService.languages) {
+                // only show language icons if there are no more specific icons in the style document
+                if (!iconInfo.coveredLanguages[language.id]) {
+                    const icon = this.languageService.getIcon(language.id);
+                    if (icon) {
+                        this.icons.add(this.fileIcon);
+                        this.icons.add(this.languageIcon(language.id));
+                        this.icons.add(icon);
+                    }
+                }
+            }
+        }
     }
 
     protected toCSSUrl(iconPath: string | undefined): string | undefined {
@@ -348,7 +375,7 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
         return value;
     }
 
-    protected readonly fileIcon = 'theia-plugin-file-icon';
+    protected readonly fileIcon = PLUGIN_FILE_ICON_CLASS;
     protected readonly folderIcon = 'theia-plugin-folder-icon';
     protected readonly folderExpandedIcon = 'theia-plugin-folder-expanded-icon';
     protected readonly rootFolderIcon = 'theia-plugin-root-folder-icon';
@@ -384,10 +411,8 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
         return 'theia-plugin-' + this.escapeCSS(languageId) + '-lang-file-icon';
     }
 
-    protected collectSelectors(
-        associations: RecursivePartial<PluginIconsAssociation>,
-        accept: (definitionId: string, ...icons: string[]) => void
-    ): void {
+    protected collectSelectors(associations: RecursivePartial<PluginIconsAssociation>, accept: (definitionId: string, ...icons: string[]) => void): PluginLanguageIconInfo {
+        const iconInfo = new PluginLanguageIconInfo();
         if (associations.folder) {
             accept(associations.folder, this.folderIcon);
             if (associations.folderExpanded === undefined) {
@@ -441,6 +466,8 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
             for (const languageId in languageIds) {
                 accept(languageIds[languageId]!, this.languageIcon(languageId), this.fileIcon);
                 this.hasFileIcons = true;
+                iconInfo.hasSpecificFileIcons = true;
+                iconInfo.coveredLanguages[languageId] = true;
             }
         }
         const fileExtensions = associations.fileExtensions;
@@ -449,6 +476,7 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
             for (const fileExtension in fileExtensions) {
                 accept(fileExtensions[fileExtension]!, ...this.fileExtensionIcon(fileExtension), this.fileIcon);
                 this.hasFileIcons = true;
+                iconInfo.hasSpecificFileIcons = true;
             }
         }
         const fileNames = associations.fileNames;
@@ -457,8 +485,10 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
             for (const fileName in fileNames) {
                 accept(fileNames[fileName]!, ...this.fileNameIcon(fileName), this.fileIcon);
                 this.hasFileIcons = true;
+                iconInfo.hasSpecificFileIcons = true;
             }
         }
+        return iconInfo;
     }
 
     /**
@@ -529,6 +559,10 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
             }
             const language = StandaloneServices.get(ILanguageService).createByFilepathOrFirstLine(parsedURI['codeUri']);
             classNames.push(this.languageIcon(language.languageId));
+            const defaultLanguageIcon = this.languageService.getIcon(language.languageId);
+            if (defaultLanguageIcon) {
+                classNames.push(defaultLanguageIcon);
+            }
         }
         return classNames;
     }

package/src/main/browser/plugin-shared-style.ts

@@ -23,14 +23,19 @@ import { Reference, SyncReferenceCollection } from '@theia/core/lib/common/refer
 import { Endpoint } from '@theia/core/lib/browser/endpoint';
 
 export interface PluginIconKey {
-    url: IconUrl
-    size: number
+    url: IconUrl;
+    size?: number;
+    type?: 'icon' | 'file';
 }
 
 export interface PluginIcon extends Disposable {
     readonly iconClass: string
 }
 
+export const PLUGIN_FILE_ICON_CLASS = 'theia-plugin-file-icon';
+
+export const DEFAULT_ICON_SIZE = 16;
+
 @injectable()
 export class PluginSharedStyle {
 
@@ -98,30 +103,45 @@ export class PluginSharedStyle {
     }
 
     private readonly icons = new SyncReferenceCollection<PluginIconKey, PluginIcon>(key => this.createPluginIcon(key));
-    toIconClass(url: IconUrl, { size }: { size: number } = { size: 16 }): Reference<PluginIcon> {
+    toIconClass(url: IconUrl, { size }: { size: number } = { size: DEFAULT_ICON_SIZE }): Reference<PluginIcon> {
         return this.icons.acquire({ url, size });
     }
 
+    toFileIconClass(url: IconUrl): Reference<PluginIcon> {
+        return this.icons.acquire({ url, type: 'file' });
+    }
+
     private iconSequence = 0;
     protected createPluginIcon(key: PluginIconKey): PluginIcon {
         const iconUrl = key.url;
-        const size = key.size;
+        const size = key.size ?? DEFAULT_ICON_SIZE;
+        const type = key.type ?? 'icon';
         const darkIconUrl = PluginSharedStyle.toExternalIconUrl(`${typeof iconUrl === 'object' ? iconUrl.dark : iconUrl}`);
         const lightIconUrl = PluginSharedStyle.toExternalIconUrl(`${typeof iconUrl === 'object' ? iconUrl.light : iconUrl}`);
-        const iconClass = 'plugin-icon-' + this.iconSequence++;
+
         const toDispose = new DisposableCollection();
-        toDispose.push(this.insertRule('.' + iconClass + '::before', theme => `
-                content: "";
-                background-position: 2px;
-                width: ${size}px;
-                height: ${size}px;
-                background: center no-repeat url("${theme.type === 'light' ? lightIconUrl : darkIconUrl}");
-                background-size: ${size}px;
-            `));
-        return {
-            iconClass,
-            dispose: () => toDispose.dispose()
-        };
+        let iconClass = 'plugin-icon-' + this.iconSequence++;
+        if (type === 'icon') {
+            toDispose.push(this.insertRule('.' + iconClass + '::before', theme => `
+                    content: "";
+                    background-position: 2px;
+                    display: block;
+                    width: ${size}px;
+                    height: ${size}px;
+                    background: center no-repeat url("${theme.type === 'light' ? lightIconUrl : darkIconUrl}");
+                    background-size: ${size}px;
+                `));
+        } else {
+            toDispose.push(this.insertRule('.' + iconClass + '::before', theme => `
+                    content: "";
+                    background-image: url("${theme.type === 'light' ? lightIconUrl : darkIconUrl}");
+                    background-size: ${DEFAULT_ICON_SIZE}px;
+                    background-position: left center;
+                    background-repeat: no-repeat;
+                `));
+            iconClass += ' ' + PLUGIN_FILE_ICON_CLASS;
+        }
+        return { iconClass, dispose: () => toDispose.dispose() };
     }
 
     static toExternalIconUrl(iconUrl: string): string {