|
1 | | -import type { Theme } from '@theia/core/lib/common/theme'; |
2 | | -import { injectable } from '@theia/core/shared/inversify'; |
3 | | -import { ThemeServiceWithDB as TheiaThemeServiceWithDB } from '@theia/monaco/lib/browser/monaco-indexed-db'; |
| 1 | +import { |
| 2 | + BuiltinThemeProvider, |
| 3 | + ThemeService, |
| 4 | +} from '@theia/core/lib/browser/theming'; |
| 5 | +import { nls } from '@theia/core/lib/common/nls'; |
| 6 | +import type { Theme, ThemeType } from '@theia/core/lib/common/theme'; |
4 | 7 |
|
5 | 8 | export namespace ArduinoThemes { |
6 | | - export const Light: Theme = { |
| 9 | + export const light: Theme = { |
7 | 10 | id: 'arduino-theme', |
8 | 11 | type: 'light', |
9 | 12 | label: 'Light (Arduino)', |
10 | 13 | editorTheme: 'arduino-theme', |
11 | 14 | }; |
12 | | - export const Dark: Theme = { |
| 15 | + export const dark: Theme = { |
13 | 16 | id: 'arduino-theme-dark', |
14 | 17 | type: 'dark', |
15 | 18 | label: 'Dark (Arduino)', |
16 | 19 | editorTheme: 'arduino-theme-dark', |
17 | 20 | }; |
18 | 21 | } |
19 | 22 |
|
20 | | -@injectable() |
21 | | -export class ThemeServiceWithDB extends TheiaThemeServiceWithDB { |
22 | | - protected override init(): void { |
23 | | - this.register(ArduinoThemes.Light, ArduinoThemes.Dark); |
24 | | - super.init(); |
| 23 | +const builtInThemeIds = new Set( |
| 24 | + [ |
| 25 | + ArduinoThemes.light, |
| 26 | + ArduinoThemes.dark, |
| 27 | + BuiltinThemeProvider.hcTheme, |
| 28 | + // TODO: add the HC light theme after Theia 1.36 |
| 29 | + ].map(({ id }) => id) |
| 30 | +); |
| 31 | +const deprecatedThemeIds = new Set( |
| 32 | + [BuiltinThemeProvider.lightTheme, BuiltinThemeProvider.darkTheme].map( |
| 33 | + ({ id }) => id |
| 34 | + ) |
| 35 | +); |
| 36 | + |
| 37 | +export const lightThemeLabel = nls.localize('arduino/theme/light', 'Light'); |
| 38 | +export const darkThemeLabel = nls.localize('arduino/theme/dark', 'Dark'); |
| 39 | +export const hcThemeLabel = nls.localize('arduino/theme/hc', 'High Contrast'); |
| 40 | +export function userThemeLabel(theme: Theme): string { |
| 41 | + return nls.localize('arduino/theme/user', '{0} (user)', theme.label); |
| 42 | +} |
| 43 | +export function deprecatedThemeLabel(theme: Theme): string { |
| 44 | + return nls.localize( |
| 45 | + 'arduino/theme/deprecated', |
| 46 | + '{0} (deprecated)', |
| 47 | + theme.label |
| 48 | + ); |
| 49 | +} |
| 50 | + |
| 51 | +export function themeLabelForSettings(theme: Theme): string { |
| 52 | + switch (theme.id) { |
| 53 | + case ArduinoThemes.light.id: |
| 54 | + return lightThemeLabel; |
| 55 | + case ArduinoThemes.dark.id: |
| 56 | + return darkThemeLabel; |
| 57 | + case BuiltinThemeProvider.hcTheme.id: |
| 58 | + return hcThemeLabel; |
| 59 | + case BuiltinThemeProvider.lightTheme.id: // fall-through |
| 60 | + case BuiltinThemeProvider.darkTheme.id: |
| 61 | + return deprecatedThemeLabel(theme); |
| 62 | + default: |
| 63 | + return userThemeLabel(theme); |
| 64 | + } |
| 65 | +} |
| 66 | + |
| 67 | +export function compatibleBuiltInTheme(theme: Theme): Theme { |
| 68 | + switch (theme.type) { |
| 69 | + case 'light': |
| 70 | + return ArduinoThemes.light; |
| 71 | + case 'dark': |
| 72 | + return ArduinoThemes.dark; |
| 73 | + case 'hc': |
| 74 | + return BuiltinThemeProvider.hcTheme; |
| 75 | + default: { |
| 76 | + console.warn( |
| 77 | + `Unhandled theme type: ${theme.type}. Theme ID: ${theme.id}, label: ${theme.label}` |
| 78 | + ); |
| 79 | + return ArduinoThemes.light; |
| 80 | + } |
| 81 | + } |
| 82 | +} |
| 83 | + |
| 84 | +// For tests without DI |
| 85 | +interface ThemeProvider { |
| 86 | + themes(): Theme[]; |
| 87 | + currentTheme(): Theme; |
| 88 | +} |
| 89 | + |
| 90 | +/** |
| 91 | + * Returns with a list of built-in themes officially supported by IDE2 (https://github.com/arduino/arduino-ide/issues/1283). |
| 92 | + * The themes in the array follow the following order: |
| 93 | + * - built-in themes first (in `Light`, `Dark`, `High Contrast`), // TODO -> High Contrast will be split up to HC Dark and HC Light after the Theia version uplift |
| 94 | + * - followed by user installed (VSIX) themes grouped by theme type, then alphabetical order, |
| 95 | + * - if the `currentTheme` is either Light (Theia) or Dark (Theia), the last item of the array will be the selected theme with `(deprecated)` suffix. |
| 96 | + */ |
| 97 | +export function userConfigurableThemes(service: ThemeService): Theme[]; |
| 98 | +export function userConfigurableThemes(provider: ThemeProvider): Theme[]; |
| 99 | +export function userConfigurableThemes( |
| 100 | + serviceOrProvider: ThemeService | ThemeProvider |
| 101 | +): Theme[] { |
| 102 | + const provider = |
| 103 | + serviceOrProvider instanceof ThemeService |
| 104 | + ? { |
| 105 | + currentTheme: () => serviceOrProvider.getCurrentTheme(), |
| 106 | + themes: () => serviceOrProvider.getThemes(), |
| 107 | + } |
| 108 | + : serviceOrProvider; |
| 109 | + const currentTheme = provider.currentTheme(); |
| 110 | + return provider |
| 111 | + .themes() |
| 112 | + .map((theme) => ({ ...theme, arduinoThemeType: arduinoThemeTypeOf(theme) })) |
| 113 | + .filter( |
| 114 | + (theme) => |
| 115 | + theme.arduinoThemeType !== 'deprecated' || currentTheme.id === theme.id |
| 116 | + ) |
| 117 | + .sort((left, right) => { |
| 118 | + const leftArduinoThemeType = left.arduinoThemeType; |
| 119 | + const rightArduinoThemeType = right.arduinoThemeType; |
| 120 | + if (leftArduinoThemeType === rightArduinoThemeType) { |
| 121 | + const result = themeTypeOrder[left.type] - themeTypeOrder[right.type]; |
| 122 | + if (result) { |
| 123 | + return result; |
| 124 | + } |
| 125 | + return left.label.localeCompare(right.label); // alphabetical order |
| 126 | + } |
| 127 | + return ( |
| 128 | + arduinoThemeTypeOrder[leftArduinoThemeType] - |
| 129 | + arduinoThemeTypeOrder[rightArduinoThemeType] |
| 130 | + ); |
| 131 | + }); |
| 132 | +} |
| 133 | + |
| 134 | +export type ArduinoThemeType = 'built-in' | 'user' | 'deprecated'; |
| 135 | +const arduinoThemeTypeOrder: Record<ArduinoThemeType, number> = { |
| 136 | + 'built-in': 0, |
| 137 | + user: 1, |
| 138 | + deprecated: 2, |
| 139 | +}; |
| 140 | +const themeTypeOrder: Record<ThemeType, number> = { |
| 141 | + light: 0, |
| 142 | + dark: 1, |
| 143 | + hc: 2, |
| 144 | +}; |
| 145 | + |
| 146 | +export function arduinoThemeTypeOf(theme: Theme | string): ArduinoThemeType { |
| 147 | + const themeId = typeof theme === 'string' ? theme : theme.id; |
| 148 | + if (builtInThemeIds.has(themeId)) { |
| 149 | + return 'built-in'; |
| 150 | + } |
| 151 | + if (deprecatedThemeIds.has(themeId)) { |
| 152 | + return 'deprecated'; |
25 | 153 | } |
| 154 | + return 'user'; |
26 | 155 | } |
0 commit comments