@theia/core 1.43.0 → 1.44.0

package/src/browser/frontend-application-module.ts

@@ -138,6 +138,7 @@ import { StylingParticipant, StylingService } from './styling-service';
 import { bindCommonStylingParticipants } from './common-styling-participants';
 import { HoverService } from './hover-service';
 import { AdditionalViewsMenuWidget, AdditionalViewsMenuWidgetFactory } from './shell/additional-views-menu-widget';
+import { LanguageIconLabelProvider } from './language-icon-provider';
 
 export { bindResourceProvider, bindMessageService, bindPreferenceService };
 
@@ -150,6 +151,8 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
     bind(IconThemeContribution).toService(DefaultFileIconThemeContribution);
     bind(IconThemeApplicationContribution).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(IconThemeApplicationContribution);
+    bind(LanguageIconLabelProvider).toSelf().inSingletonScope();
+    bind(LabelProviderContribution).toService(LanguageIconLabelProvider);
 
     bind(ColorRegistry).toSelf().inSingletonScope();
     bindContributionProvider(bind, ColorContribution);

package/src/browser/icon-theme-contribution.ts

@@ -50,6 +50,7 @@ export class DefaultFileIconThemeContribution implements IconTheme, IconThemeCon
     readonly label = 'File Icons (Theia)';
     readonly hasFileIcons = true;
     readonly hasFolderIcons = true;
+    readonly showLanguageModeIcons = true;
 
     registerIconThemes(iconThemes: IconThemeService): MaybePromise<void> {
         iconThemes.register(this);

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

@@ -31,6 +31,7 @@ export interface IconThemeDefinition {
     readonly hasFileIcons?: boolean;
     readonly hasFolderIcons?: boolean;
     readonly hidesExplorerArrows?: boolean;
+    readonly showLanguageModeIcons?: boolean;
 }
 
 export interface IconTheme extends IconThemeDefinition {

package/src/browser/language-icon-provider.ts

@@ -0,0 +1,55 @@
+// *****************************************************************************
+// Copyright (C) 2023 EclipseSource 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 { inject, injectable, postConstruct } from 'inversify';
+import { Emitter, Event } from '../common';
+import { IconThemeService } from './icon-theme-service';
+import { DidChangeLabelEvent, LabelProviderContribution } from './label-provider';
+import { LanguageService } from './language-service';
+
+@injectable()
+export class LanguageIconLabelProvider implements LabelProviderContribution {
+    @inject(IconThemeService) protected readonly iconThemeService: IconThemeService;
+    @inject(LanguageService) protected readonly languageService: LanguageService;
+
+    protected readonly onDidChangeEmitter = new Emitter<DidChangeLabelEvent>();
+
+    @postConstruct()
+    protected init(): void {
+        this.languageService.onDidChangeIcon(() => this.fireDidChange());
+    }
+
+    canHandle(element: object): number {
+        const current = this.iconThemeService.getDefinition(this.iconThemeService.current);
+        return current?.showLanguageModeIcons === true && this.languageService.getIcon(element) ? Number.MAX_SAFE_INTEGER : 0;
+    }
+
+    getIcon(element: object): string | undefined {
+        const language = this.languageService.detectLanguage(element);
+        return this.languageService.getIcon(language!.id);
+    }
+
+    get onDidChange(): Event<DidChangeLabelEvent> {
+        return this.onDidChangeEmitter.event;
+    }
+
+    protected fireDidChange(): void {
+        this.onDidChangeEmitter.fire({
+            affects: element => this.canHandle(element) > 0
+        });
+    }
+
+}

package/src/browser/language-service.ts

@@ -15,16 +15,19 @@
 // *****************************************************************************
 
 import { injectable } from 'inversify';
+import { Disposable, Emitter, Event } from '../common';
 
 export interface Language {
     readonly id: string;
     readonly name: string;
     readonly extensions: Set<string>;
     readonly filenames: Set<string>;
+    readonly iconClass?: string;
 }
 
 @injectable()
 export class LanguageService {
+    protected readonly onDidChangeIconEmitter = new Emitter<DidChangeIconEvent>();
 
     /**
      * It should be implemented by an extension, e.g. by the monaco extension.
@@ -40,4 +43,35 @@ export class LanguageService {
         return undefined;
     }
 
+    /**
+     * It should be implemented by an extension, e.g. by the monaco extension.
+     */
+    detectLanguage(obj: unknown): Language | undefined {
+        return undefined;
+    }
+
+    /**
+     * It should be implemented by an extension, e.g. by the monaco extension.
+     */
+    registerIcon(languageId: string, iconClass: string): Disposable {
+        return Disposable.NULL;
+    }
+
+    /**
+     * It should be implemented by an extension, e.g. by the monaco extension.
+     */
+    getIcon(obj: unknown): string | undefined {
+        return undefined;
+    }
+
+    /**
+     * Emit when the icon of a particular language was changed.
+     */
+    get onDidChangeIcon(): Event<DidChangeIconEvent> {
+        return this.onDidChangeIconEmitter.event;
+    }
+}
+
+export interface DidChangeIconEvent {
+    languageId: string;
 }

package/src/browser/messaging/ws-connection-provider.ts

@@ -119,7 +119,7 @@ export class WebSocketConnectionProvider extends AbstractConnectionProvider<WebS
     protected createWebSocketUrl(path: string): string {
         // Since we are using Socket.io, the path should look like the following:
         // proto://domain.com/{path}
-        return this.createEndpoint(path).getWebSocketUrl().toString();
+        return this.createEndpoint(path).getWebSocketUrl().withPath(path).toString();
     }
 
     protected createHttpWebSocketUrl(path: string): string {

package/src/browser/style/index.css

@@ -322,6 +322,7 @@ button.secondary[disabled],
 | Import children style files
 |----------------------------------------------------------------------------*/
 
+@import "./os.css";
 @import "./dockpanel.css";
 @import "./dialog.css";
 @import "./menus.css";

package/src/browser/style/os.css

@@ -0,0 +1,87 @@
+/********************************************************************************
+ * Copyright (C) 2019 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-only WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+.mac {
+  --theia-ui-font-family: -apple-system,BlinkMacSystemFont,sans-serif
+}
+
+.mac:lang(zh-Hans) {
+  --theia-ui-font-family: -apple-system,BlinkMacSystemFont,PingFang SC,Hiragino Sans GB,sans-serif
+}
+
+.mac:lang(zh-Hant) {
+  --theia-ui-font-family: -apple-system,BlinkMacSystemFont,PingFang TC,sans-serif
+}
+
+.mac:lang(ja) {
+  --theia-ui-font-family: -apple-system,BlinkMacSystemFont,Hiragino Kaku Gothic Pro,sans-serif
+}
+
+.mac:lang(ko) {
+  --theia-ui-font-family: -apple-system,BlinkMacSystemFont,Nanum Gothic,Apple SD Gothic Neo,AppleGothic,sans-serif
+}
+
+.windows {
+  --theia-ui-font-family: Segoe WPC,Segoe UI,sans-serif
+}
+
+.windows:lang(zh-Hans) {
+  --theia-ui-font-family: Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif
+}
+
+.windows:lang(zh-Hant) {
+  --theia-ui-font-family: Segoe WPC,Segoe UI,Microsoft Jhenghei,sans-serif
+}
+
+.windows:lang(ja) {
+  --theia-ui-font-family: Segoe WPC,Segoe UI,Yu Gothic UI,Meiryo UI,sans-serif
+}
+
+.windows:lang(ko) {
+  --theia-ui-font-family: Segoe WPC,Segoe UI,Malgun Gothic,Dotom,sans-serif
+}
+
+.linux {
+  --theia-ui-font-family: system-ui,Ubuntu,Droid Sans,sans-serif
+}
+
+.linux:lang(zh-Hans) {
+  --theia-ui-font-family: system-ui,Ubuntu,Droid Sans,Source Han Sans SC,Source Han Sans CN,Source Han Sans,sans-serif
+}
+
+.linux:lang(zh-Hant) {
+  --theia-ui-font-family: system-ui,Ubuntu,Droid Sans,Source Han Sans TC,Source Han Sans TW,Source Han Sans,sans-serif
+}
+
+.linux:lang(ja) {
+  --theia-ui-font-family: system-ui,Ubuntu,Droid Sans,Source Han Sans J,Source Han Sans JP,Source Han Sans,sans-serif
+}
+
+.linux:lang(ko) {
+  --theia-ui-font-family: system-ui,Ubuntu,Droid Sans,Source Han Sans K,Source Han Sans JR,Source Han Sans,UnDotum,FBaekmuk Gulim,sans-serif
+}
+
+.mac {
+  --monaco-monospace-font: "SF Mono",Monaco,Menlo,Courier,monospace
+}
+
+.windows {
+  --monaco-monospace-font: Consolas,"Courier New",monospace
+}
+
+.linux {
+  --monaco-monospace-font: "Ubuntu Mono","Liberation Mono","DejaVu Sans Mono","Courier New",monospace
+}

package/src/common/contribution-filter/contribution-filter.ts

@@ -50,6 +50,15 @@ export const FilterContribution = Symbol('FilterContribution');
 export interface FilterContribution {
     /**
      * Use the registry to register your contribution filters.
+     * * Note that filtering contributions based on their class (constructor) name is discouraged.
+     * Class names are minified in production builds and therefore not reliable.
+     * Use instance of checks or direct constructor comparison instead:
+     *
+     * ```ts
+     * registry.addFilters('*', [
+     *     contrib => !(contrib instanceof SampleFilteredCommandContribution)
+     * ]);
+     * ```
      */
     registerContributionFilters(registry: ContributionFilterRegistry): void;
 }

package/src/common/event.ts

@@ -456,7 +456,7 @@ export class AsyncEmitter<T extends WaitUntilEvent> extends Emitter<T> {
                 delete (asyncEvent as any)['waitUntil'];
             }
             if (!waitables.length) {
-                return;
+                continue;
             }
             try {
                 await Promise.all(waitables);