fix: simplified official theme labels

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

Author: Akos Kitta

arduino-ide-extension/src/browser/theia/core/theming.ts

@@ -1,3 +1,4 @@
+import { Disposable } from '@theia/core';
 import {
   BuiltinThemeProvider,
   ThemeService,
@@ -8,24 +9,24 @@ import { injectable } from '@theia/core/shared/inversify';
 import { ThemeServiceWithDB as TheiaThemeServiceWithDB } from '@theia/monaco/lib/browser/monaco-indexed-db';
 
 export namespace ArduinoThemes {
-  export const Light: Theme = {
+  export const light: Theme = {
     id: 'arduino-theme',
     type: 'light',
-    label: 'Light (Arduino)',
+    label: 'Light',
     editorTheme: 'arduino-theme',
   };
-  export const Dark: Theme = {
+  export const dark: Theme = {
     id: 'arduino-theme-dark',
     type: 'dark',
-    label: 'Dark (Arduino)',
+    label: 'Dark',
     editorTheme: 'arduino-theme-dark',
   };
 }
 
 const builtInThemeIds = new Set(
   [
-    ArduinoThemes.Light,
-    ArduinoThemes.Dark,
+    ArduinoThemes.light,
+    ArduinoThemes.dark,
     BuiltinThemeProvider.hcTheme,
     // TODO: add the HC light theme after Theia 1.36
   ].map(({ id }) => id)
@@ -38,16 +39,16 @@ export function isBuiltInTheme(theme: Theme | string): boolean {
 export function compatibleBuiltInTheme(theme: Theme): Theme {
   switch (theme.type) {
     case 'light':
-      return ArduinoThemes.Light;
+      return ArduinoThemes.light;
     case 'dark':
-      return ArduinoThemes.Dark;
+      return ArduinoThemes.dark;
     case 'hc':
       return BuiltinThemeProvider.hcTheme;
     default: {
       console.warn(
         `Unhandled theme type: ${theme.type}. Theme ID: ${theme.id}, label: ${theme.label}`
       );
-      return ArduinoThemes.Light;
+      return ArduinoThemes.light;
     }
   }
 }
@@ -63,6 +64,20 @@ export class ThemeServiceWithDB extends TheiaThemeServiceWithDB {
     // this.register(ArduinoThemes.Light, ArduinoThemes.Dark); // TODO: check if needed
     super.init();
   }
+
+  override register(...themes: Theme[]): Disposable {
+    const hcThemeIndex = themes.findIndex(
+      (theme) => theme.id === BuiltinThemeProvider.hcTheme.id
+    );
+    if (hcThemeIndex >= 0) {
+      const hcTheme = themes[hcThemeIndex];
+      themes.splice(hcThemeIndex, 1, {
+        ...hcTheme,
+        label: nls.localize('arduino/theme/hcDark', 'High Contrast (Dark)'),
+      });
+    }
+    return super.register(...themes);
+  }
 }
 
 interface ThemeProvider {

arduino-ide-extension/src/browser/theia/monaco/monaco-theming-service.ts

@@ -104,16 +104,16 @@ export class MonacoThemingService extends TheiaMonacoThemingService {
   }
 
   private registerArduinoThemes(): void {
-    const { Light, Dark } = ArduinoThemes;
+    const { light, dark } = ArduinoThemes;
     this.registerParsedTheme({
-      id: Light.id,
-      label: Light.label,
+      id: light.id,
+      label: light.label,
       uiTheme: 'vs',
       json: require('../../../../src/browser/data/default.color-theme.json'),
     });
     this.registerParsedTheme({
-      id: Dark.id,
-      label: Dark.label,
+      id: dark.id,
+      label: dark.label,
       uiTheme: 'vs-dark',
       json: require('../../../../src/browser/data/dark.color-theme.json'),
     });

arduino-ide-extension/src/test/browser/theming.test.ts

@@ -28,35 +28,35 @@ describe('theming', () => {
     it('if the current theme is a built-in theme, the result does not contain any contributed theme', () => {
       const actual = userConfigurableThemes({
         themes: () => [
-          ArduinoThemes.Light,
-          ArduinoThemes.Dark,
+          ArduinoThemes.light,
+          ArduinoThemes.dark,
           testTheme,
           BuiltinThemeProvider.hcTheme,
           anotherTestTheme,
         ],
         currentTheme: () => BuiltinThemeProvider.hcTheme,
       });
       expect(actual.length).to.be.equal(3);
-      expect(actual[0].id).to.be.equal(ArduinoThemes.Light.id);
-      expect(actual[1].id).to.be.equal(ArduinoThemes.Dark.id);
+      expect(actual[0].id).to.be.equal(ArduinoThemes.light.id);
+      expect(actual[1].id).to.be.equal(ArduinoThemes.dark.id);
       expect(actual[2].id).to.be.equal(BuiltinThemeProvider.hcTheme.id);
     });
 
     it('if the currently selected theme is a contributed one, it is the last element in the array', () => {
       const actual = userConfigurableThemes({
         themes: () => [
           BuiltinThemeProvider.hcTheme,
-          ArduinoThemes.Dark,
-          ArduinoThemes.Light,
+          ArduinoThemes.dark,
+          ArduinoThemes.light,
           testTheme,
           anotherTestTheme,
         ],
         currentTheme: () => testTheme,
       });
       expect(actual.length).to.be.equal(4);
       expect(actual[0].id).to.be.equal(BuiltinThemeProvider.hcTheme.id);
-      expect(actual[1].id).to.be.equal(ArduinoThemes.Dark.id);
-      expect(actual[2].id).to.be.equal(ArduinoThemes.Light.id);
+      expect(actual[1].id).to.be.equal(ArduinoThemes.dark.id);
+      expect(actual[2].id).to.be.equal(ArduinoThemes.light.id);
       expect(actual[3].id).to.be.equal(testTheme.id);
     });
   });
@@ -67,8 +67,8 @@ describe('theming', () => {
         [BuiltinThemeProvider.lightTheme, false],
         [BuiltinThemeProvider.darkTheme, false],
         [BuiltinThemeProvider.hcTheme, true],
-        [ArduinoThemes.Light, true],
-        [ArduinoThemes.Dark, true],
+        [ArduinoThemes.light, true],
+        [ArduinoThemes.dark, true],
         [testTheme, false],
       ] as [Theme, boolean][]
     ).map(([theme, expected]) =>

i18n/en.json

@@ -469,6 +469,7 @@
     "theme": {
       "contributedTheme": "Contributed Theme",
       "couldNotLoadTheme": "Could not load your currently selected theme: {0}. Do you want to automatically select a compatible theme?",
+      "hcDark": "High Contrast (Dark)",
       "selectManually": "Select Manually"
     },
     "title": {