@codingame/monaco-vscode-theme-service-override 38.1.3 → 39.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/vscode/src/vs/workbench/contrib/themes/browser/themes.contribution.js +46 -45
- package/vscode/src/vs/workbench/services/themes/browser/colorThemeCss.js +1 -0
- package/vscode/src/vs/workbench/services/themes/browser/fileIconThemeData.js +2 -2
- package/vscode/src/vs/workbench/services/themes/browser/productIconThemeData.js +12 -12
- package/vscode/src/vs/workbench/services/themes/browser/workbenchThemeService.js +5 -4
- package/vscode/src/vs/workbench/services/themes/common/colorThemeSchema.js +17 -16
- package/vscode/src/vs/workbench/services/themes/common/fileIconThemeSchema.js +39 -39
- package/vscode/src/vs/workbench/services/themes/common/productIconThemeSchema.js +7 -7
- package/vscode/src/vs/workbench/services/themes/common/themeConfiguration.js +37 -36
- package/vscode/src/vs/workbench/services/themes/common/themeExtensionPoints.js +21 -21
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-theme-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "39.0.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - theme service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-api": "
|
|
19
|
-
"@codingame/monaco-vscode-files-service-override": "
|
|
18
|
+
"@codingame/monaco-vscode-api": "39.0.0",
|
|
19
|
+
"@codingame/monaco-vscode-files-service-override": "39.0.0"
|
|
20
20
|
},
|
|
21
21
|
"main": "index.js",
|
|
22
22
|
"module": "index.js",
|
|
@@ -13,6 +13,7 @@ import { IExtensionGalleryService, IExtensionManagementService } from '@codingam
|
|
|
13
13
|
import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
|
|
14
14
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
|
|
15
15
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
|
|
16
|
+
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/confettiColors';
|
|
16
17
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
|
|
17
18
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
|
|
18
19
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
|
|
@@ -53,7 +54,7 @@ import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/com
|
|
|
53
54
|
import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
|
|
54
55
|
import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
|
|
55
56
|
|
|
56
|
-
const manageExtensionIcon = registerIcon("theme-selection-manage-extension", Codicon.gear, ( localize(
|
|
57
|
+
const manageExtensionIcon = registerIcon("theme-selection-manage-extension", Codicon.gear, ( localize(26025, "Icon for the 'Manage' action in the theme selection quick pick.")));
|
|
57
58
|
var ConfigureItem;
|
|
58
59
|
(function(ConfigureItem) {
|
|
59
60
|
ConfigureItem["BROWSE_GALLERY"] = "marketplace";
|
|
@@ -184,7 +185,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
|
|
|
184
185
|
quickpick.matchOnDescription = true;
|
|
185
186
|
quickpick.buttons = [this.quickInputService.backButton];
|
|
186
187
|
quickpick.title = "Marketplace Themes";
|
|
187
|
-
quickpick.placeholder = ( localize(
|
|
188
|
+
quickpick.placeholder = ( localize(26026, "Type to Search More. Select to Install. Up/Down Keys to Preview"));
|
|
188
189
|
quickpick.canSelectMany = false;
|
|
189
190
|
disposables.add(quickpick.onDidChangeValue(() => this.trigger(quickpick.value)));
|
|
190
191
|
disposables.add(quickpick.onDidAccept(async _ => {
|
|
@@ -238,7 +239,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
|
|
|
238
239
|
});
|
|
239
240
|
} else if (items.length === 0 && this._searchError) {
|
|
240
241
|
items = [{
|
|
241
|
-
label: `$(error) ${( localize(
|
|
242
|
+
label: `$(error) ${( localize(26027, "Error while searching for themes: {0}", this._searchError))}`,
|
|
242
243
|
id: undefined,
|
|
243
244
|
alwaysShow: true
|
|
244
245
|
}];
|
|
@@ -260,12 +261,12 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
|
|
|
260
261
|
this.extensionsWorkbenchService.openSearch(`@id:${galleryExtension.identifier.id}`);
|
|
261
262
|
const result = await this.dialogService.confirm({
|
|
262
263
|
message: ( localize(
|
|
263
|
-
|
|
264
|
+
26028,
|
|
264
265
|
"This will install extension '{0}' published by '{1}'. Do you want to continue?",
|
|
265
266
|
galleryExtension.displayName,
|
|
266
267
|
galleryExtension.publisherDisplayName
|
|
267
268
|
)),
|
|
268
|
-
primaryButton: ( localize(
|
|
269
|
+
primaryButton: ( localize(26029, "OK"))
|
|
269
270
|
});
|
|
270
271
|
if (!result.confirmed) {
|
|
271
272
|
return false;
|
|
@@ -273,7 +274,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
|
|
|
273
274
|
try {
|
|
274
275
|
await this.progressService.withProgress({
|
|
275
276
|
location: ProgressLocation.Notification,
|
|
276
|
-
title: ( localize(
|
|
277
|
+
title: ( localize(26030, "Installing Extension {0}...", galleryExtension.displayName))
|
|
277
278
|
}, async () => {
|
|
278
279
|
await this.extensionManagementService.installFromGallery(galleryExtension, {
|
|
279
280
|
isMachineScoped: false
|
|
@@ -424,7 +425,7 @@ registerAction2(class extends Action2 {
|
|
|
424
425
|
constructor() {
|
|
425
426
|
super({
|
|
426
427
|
id: SelectColorThemeCommandId,
|
|
427
|
-
title: ( localize2(
|
|
428
|
+
title: ( localize2(26031, "Color Theme")),
|
|
428
429
|
category: Categories.Preferences,
|
|
429
430
|
f1: true,
|
|
430
431
|
keybinding: {
|
|
@@ -436,15 +437,15 @@ registerAction2(class extends Action2 {
|
|
|
436
437
|
getTitle(colorScheme) {
|
|
437
438
|
switch (colorScheme) {
|
|
438
439
|
case ColorScheme.DARK:
|
|
439
|
-
return localize(
|
|
440
|
+
return localize(26032, "Select Color Theme for System Dark Mode");
|
|
440
441
|
case ColorScheme.LIGHT:
|
|
441
|
-
return localize(
|
|
442
|
+
return localize(26033, "Select Color Theme for System Light Mode");
|
|
442
443
|
case ColorScheme.HIGH_CONTRAST_DARK:
|
|
443
|
-
return localize(
|
|
444
|
+
return localize(26034, "Select Color Theme for High Contrast Dark Mode");
|
|
444
445
|
case ColorScheme.HIGH_CONTRAST_LIGHT:
|
|
445
|
-
return localize(
|
|
446
|
+
return localize(26035, "Select Color Theme for High Contrast Light Mode");
|
|
446
447
|
default:
|
|
447
|
-
return localize(
|
|
448
|
+
return localize(26036, "Select Color Theme (detect system color mode disabled)");
|
|
448
449
|
}
|
|
449
450
|
}
|
|
450
451
|
async run(accessor) {
|
|
@@ -452,13 +453,13 @@ registerAction2(class extends Action2 {
|
|
|
452
453
|
const preferencesService = accessor.get(IPreferencesService);
|
|
453
454
|
const preferredColorScheme = themeService.getPreferredColorScheme();
|
|
454
455
|
const modeConfigureButton = {
|
|
455
|
-
tooltip: preferredColorScheme ? ( localize(
|
|
456
|
+
tooltip: preferredColorScheme ? ( localize(26037, "Detect system color mode enabled. Click to configure.")) : ( localize(26038, "Detect system color mode disabled. Click to configure.")),
|
|
456
457
|
iconClass: ThemeIcon.asClassName(Codicon.colorMode),
|
|
457
458
|
location: QuickInputButtonLocation.Inline
|
|
458
459
|
};
|
|
459
460
|
const options = {
|
|
460
|
-
installMessage: ( localize(
|
|
461
|
-
browseMessage: "$(plus) " + ( localize(
|
|
461
|
+
installMessage: ( localize(26039, "Install Additional Color Themes...")),
|
|
462
|
+
browseMessage: "$(plus) " + ( localize(26040, "Browse Additional Color Themes...")),
|
|
462
463
|
placeholderMessage: this.getTitle(preferredColorScheme),
|
|
463
464
|
marketplaceTag: "category:themes",
|
|
464
465
|
buttons: [modeConfigureButton],
|
|
@@ -475,9 +476,9 @@ registerAction2(class extends Action2 {
|
|
|
475
476
|
const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
|
|
476
477
|
const themes = await themeService.getColorThemes();
|
|
477
478
|
const currentTheme = themeService.getColorTheme();
|
|
478
|
-
const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(
|
|
479
|
-
const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(
|
|
480
|
-
const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(
|
|
479
|
+
const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(26041, "light themes")));
|
|
480
|
+
const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(26042, "dark themes")));
|
|
481
|
+
const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(26043, "high contrast themes")));
|
|
481
482
|
let picks;
|
|
482
483
|
switch (preferredColorScheme) {
|
|
483
484
|
case ColorScheme.DARK:
|
|
@@ -500,7 +501,7 @@ registerAction2(class extends Action2 {
|
|
|
500
501
|
constructor() {
|
|
501
502
|
super({
|
|
502
503
|
id: SelectFileIconThemeCommandId,
|
|
503
|
-
title: ( localize2(
|
|
504
|
+
title: ( localize2(26044, "File Icon Theme")),
|
|
504
505
|
category: Categories.Preferences,
|
|
505
506
|
f1: true
|
|
506
507
|
});
|
|
@@ -508,8 +509,8 @@ registerAction2(class extends Action2 {
|
|
|
508
509
|
async run(accessor) {
|
|
509
510
|
const themeService = accessor.get(IWorkbenchThemeService);
|
|
510
511
|
const options = {
|
|
511
|
-
installMessage: ( localize(
|
|
512
|
-
placeholderMessage: ( localize(
|
|
512
|
+
installMessage: ( localize(26045, "Install Additional File Icon Themes...")),
|
|
513
|
+
placeholderMessage: ( localize(26046, "Select File Icon Theme (Up/Down Keys to Preview)")),
|
|
513
514
|
marketplaceTag: "tag:icon-theme"
|
|
514
515
|
};
|
|
515
516
|
const setTheme = (theme, settingsTarget) => themeService.setFileIconTheme(theme, settingsTarget);
|
|
@@ -518,12 +519,12 @@ registerAction2(class extends Action2 {
|
|
|
518
519
|
const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
|
|
519
520
|
const picks = [{
|
|
520
521
|
type: "separator",
|
|
521
|
-
label: ( localize(
|
|
522
|
+
label: ( localize(26047, "file icon themes"))
|
|
522
523
|
}, {
|
|
523
524
|
id: "",
|
|
524
525
|
theme: FileIconThemeData.noIconTheme,
|
|
525
|
-
label: ( localize(
|
|
526
|
-
description: ( localize(
|
|
526
|
+
label: ( localize(26048, "None")),
|
|
527
|
+
description: ( localize(26049, "Disable File Icons"))
|
|
527
528
|
}, ...toEntries(await themeService.getFileIconThemes())];
|
|
528
529
|
await picker.openQuickPick(picks, themeService.getFileIconTheme());
|
|
529
530
|
}
|
|
@@ -533,7 +534,7 @@ registerAction2(class extends Action2 {
|
|
|
533
534
|
constructor() {
|
|
534
535
|
super({
|
|
535
536
|
id: SelectProductIconThemeCommandId,
|
|
536
|
-
title: ( localize2(
|
|
537
|
+
title: ( localize2(26050, "Product Icon Theme")),
|
|
537
538
|
category: Categories.Preferences,
|
|
538
539
|
f1: true
|
|
539
540
|
});
|
|
@@ -541,9 +542,9 @@ registerAction2(class extends Action2 {
|
|
|
541
542
|
async run(accessor) {
|
|
542
543
|
const themeService = accessor.get(IWorkbenchThemeService);
|
|
543
544
|
const options = {
|
|
544
|
-
installMessage: ( localize(
|
|
545
|
-
browseMessage: "$(plus) " + ( localize(
|
|
546
|
-
placeholderMessage: ( localize(
|
|
545
|
+
installMessage: ( localize(26051, "Install Additional Product Icon Themes...")),
|
|
546
|
+
browseMessage: "$(plus) " + ( localize(26052, "Browse Additional Product Icon Themes...")),
|
|
547
|
+
placeholderMessage: ( localize(26053, "Select Product Icon Theme (Up/Down Keys to Preview)")),
|
|
547
548
|
marketplaceTag: "tag:product-icon-theme"
|
|
548
549
|
};
|
|
549
550
|
const setTheme = (theme, settingsTarget) => themeService.setProductIconTheme(theme, settingsTarget);
|
|
@@ -552,11 +553,11 @@ registerAction2(class extends Action2 {
|
|
|
552
553
|
const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
|
|
553
554
|
const picks = [{
|
|
554
555
|
type: "separator",
|
|
555
|
-
label: ( localize(
|
|
556
|
+
label: ( localize(26054, "product icon themes"))
|
|
556
557
|
}, {
|
|
557
558
|
id: DEFAULT_PRODUCT_ICON_THEME_ID,
|
|
558
559
|
theme: ProductIconThemeData.defaultTheme,
|
|
559
|
-
label: ( localize(
|
|
560
|
+
label: ( localize(26055, "Default"))
|
|
560
561
|
}, ...toEntries(await themeService.getProductIconThemes())];
|
|
561
562
|
await picker.openQuickPick(picks, themeService.getProductIconTheme());
|
|
562
563
|
}
|
|
@@ -565,7 +566,7 @@ registerAction2(class extends Action2 {
|
|
|
565
566
|
constructor() {
|
|
566
567
|
super({
|
|
567
568
|
id: "workbench.action.tryNewDefaultThemes",
|
|
568
|
-
title: ( localize2(
|
|
569
|
+
title: ( localize2(26056, "Try New Default Themes")),
|
|
569
570
|
category: Categories.Preferences,
|
|
570
571
|
f1: true
|
|
571
572
|
});
|
|
@@ -589,7 +590,7 @@ registerAction2(class extends Action2 {
|
|
|
589
590
|
const disposables = ( new DisposableStore());
|
|
590
591
|
const picker = disposables.add(quickInputService.createQuickPick());
|
|
591
592
|
picker.items = items;
|
|
592
|
-
picker.placeholder = ( localize(
|
|
593
|
+
picker.placeholder = ( localize(26057, "Pick a new default theme"));
|
|
593
594
|
picker.canSelectMany = false;
|
|
594
595
|
const preferredId = (previousTheme.type === ColorScheme.LIGHT || previousTheme.type === ColorScheme.HIGH_CONTRAST_LIGHT) ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
|
|
595
596
|
const activeItem = items.find(i => themes.find(t => t.id === i.id)?.settingsId === preferredId);
|
|
@@ -675,8 +676,8 @@ function isItem(i) {
|
|
|
675
676
|
return i.type !== "separator";
|
|
676
677
|
}
|
|
677
678
|
const defaultThemeDescriptions = {
|
|
678
|
-
[ThemeSettingDefaults.COLOR_THEME_LIGHT]: ( localize(
|
|
679
|
-
[ThemeSettingDefaults.COLOR_THEME_DARK]: ( localize(
|
|
679
|
+
[ThemeSettingDefaults.COLOR_THEME_LIGHT]: ( localize(26058, "Default Light")),
|
|
680
|
+
[ThemeSettingDefaults.COLOR_THEME_DARK]: ( localize(26059, "Default Dark"))
|
|
680
681
|
};
|
|
681
682
|
function toEntry(theme) {
|
|
682
683
|
const settingId = theme.settingsId ?? undefined;
|
|
@@ -715,13 +716,13 @@ function toEntries(themes, label) {
|
|
|
715
716
|
}
|
|
716
717
|
const configureButton = {
|
|
717
718
|
iconClass: ThemeIcon.asClassName(manageExtensionIcon),
|
|
718
|
-
tooltip: ( localize(
|
|
719
|
+
tooltip: ( localize(26060, "Manage Extension"))
|
|
719
720
|
};
|
|
720
721
|
registerAction2(class extends Action2 {
|
|
721
722
|
constructor() {
|
|
722
723
|
super({
|
|
723
724
|
id: "workbench.action.generateColorTheme",
|
|
724
|
-
title: ( localize2(
|
|
725
|
+
title: ( localize2(26061, "Generate Color Theme From Current Settings")),
|
|
725
726
|
category: Categories.Developer,
|
|
726
727
|
f1: true
|
|
727
728
|
});
|
|
@@ -776,7 +777,7 @@ registerAction2(class extends Action2 {
|
|
|
776
777
|
constructor() {
|
|
777
778
|
super({
|
|
778
779
|
id: toggleLightDarkThemesCommandId,
|
|
779
|
-
title: ( localize2(
|
|
780
|
+
title: ( localize2(26062, "Toggle between Light/Dark Themes")),
|
|
780
781
|
category: Categories.Preferences,
|
|
781
782
|
f1: true
|
|
782
783
|
});
|
|
@@ -788,12 +789,12 @@ registerAction2(class extends Action2 {
|
|
|
788
789
|
const preferencesService = accessor.get(IPreferencesService);
|
|
789
790
|
if (configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
|
|
790
791
|
const message = ( localize(
|
|
791
|
-
|
|
792
|
+
26063,
|
|
792
793
|
"Cannot toggle between light and dark themes when `{0}` is enabled in settings.",
|
|
793
794
|
ThemeSettings.DETECT_COLOR_SCHEME
|
|
794
795
|
));
|
|
795
796
|
notificationService.prompt(Severity.Info, message, [{
|
|
796
|
-
label: ( localize(
|
|
797
|
+
label: ( localize(26064, "Open Settings")),
|
|
797
798
|
run: () => {
|
|
798
799
|
return preferencesService.openUserSettings({
|
|
799
800
|
query: ThemeSettings.DETECT_COLOR_SCHEME
|
|
@@ -832,7 +833,7 @@ registerAction2(class extends Action2 {
|
|
|
832
833
|
constructor() {
|
|
833
834
|
super({
|
|
834
835
|
id: browseColorThemesInMarketplaceCommandId,
|
|
835
|
-
title: ( localize2(
|
|
836
|
+
title: ( localize2(26065, "Browse Color Themes in Marketplace")),
|
|
836
837
|
category: Categories.Preferences,
|
|
837
838
|
f1: true
|
|
838
839
|
});
|
|
@@ -873,13 +874,13 @@ registerAction2(class extends Action2 {
|
|
|
873
874
|
});
|
|
874
875
|
const ThemesSubMenu = ( new MenuId("ThemesSubMenu"));
|
|
875
876
|
MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
|
|
876
|
-
title: ( localize(
|
|
877
|
+
title: ( localize(26066, "Themes")),
|
|
877
878
|
submenu: ThemesSubMenu,
|
|
878
879
|
group: "2_configuration",
|
|
879
880
|
order: 7
|
|
880
881
|
});
|
|
881
882
|
MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
|
|
882
|
-
title: ( localize(
|
|
883
|
+
title: ( localize(26067, "&&Themes")),
|
|
883
884
|
submenu: ThemesSubMenu,
|
|
884
885
|
group: "2_configuration",
|
|
885
886
|
order: 7
|
|
@@ -887,21 +888,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
|
|
|
887
888
|
MenuRegistry.appendMenuItem(ThemesSubMenu, {
|
|
888
889
|
command: {
|
|
889
890
|
id: SelectColorThemeCommandId,
|
|
890
|
-
title: ( localize(
|
|
891
|
+
title: ( localize(26031, "Color Theme"))
|
|
891
892
|
},
|
|
892
893
|
order: 1
|
|
893
894
|
});
|
|
894
895
|
MenuRegistry.appendMenuItem(ThemesSubMenu, {
|
|
895
896
|
command: {
|
|
896
897
|
id: SelectFileIconThemeCommandId,
|
|
897
|
-
title: ( localize(
|
|
898
|
+
title: ( localize(26068, "File Icon Theme"))
|
|
898
899
|
},
|
|
899
900
|
order: 2
|
|
900
901
|
});
|
|
901
902
|
MenuRegistry.appendMenuItem(ThemesSubMenu, {
|
|
902
903
|
command: {
|
|
903
904
|
id: SelectProductIconThemeCommandId,
|
|
904
|
-
title: ( localize(
|
|
905
|
+
title: ( localize(26069, "Product Icon Theme"))
|
|
905
906
|
},
|
|
906
907
|
order: 3
|
|
907
908
|
});
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { getColorRegistry, asCssVariableName } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
|
|
3
3
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
|
|
4
4
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
|
|
5
|
+
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/confettiColors';
|
|
5
6
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
|
|
6
7
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
|
|
7
8
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
|
|
@@ -149,12 +149,12 @@ class FileIconThemeLoader {
|
|
|
149
149
|
const contentValue = parse(content, errors);
|
|
150
150
|
if (errors.length > 0) {
|
|
151
151
|
return Promise.reject(( new Error(( localize(
|
|
152
|
-
|
|
152
|
+
27905,
|
|
153
153
|
"Problems parsing file icons file: {0}",
|
|
154
154
|
errors.map(e => getParseErrorMessage(e.error)).join(", ")
|
|
155
155
|
)))));
|
|
156
156
|
} else if (getNodeType(contentValue) !== "object") {
|
|
157
|
-
return Promise.reject(( new Error(( localize(
|
|
157
|
+
return Promise.reject(( new Error(( localize(27906, "Invalid format for file icons theme file: Object expected.")))));
|
|
158
158
|
}
|
|
159
159
|
return Promise.resolve(contentValue);
|
|
160
160
|
});
|
|
@@ -43,7 +43,7 @@ class ProductIconThemeData {
|
|
|
43
43
|
this.isLoaded = true;
|
|
44
44
|
if (warnings.length) {
|
|
45
45
|
logService.error(( localize(
|
|
46
|
-
|
|
46
|
+
27907,
|
|
47
47
|
"Problems processing product icons definitions in {0}:\n{1}",
|
|
48
48
|
(location.toString()),
|
|
49
49
|
warnings.join("\n")
|
|
@@ -76,7 +76,7 @@ class ProductIconThemeData {
|
|
|
76
76
|
static get defaultTheme() {
|
|
77
77
|
let themeData = ProductIconThemeData._defaultProductIconTheme;
|
|
78
78
|
if (!themeData) {
|
|
79
|
-
themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( localize(
|
|
79
|
+
themeData = ProductIconThemeData._defaultProductIconTheme = ( new ProductIconThemeData(DEFAULT_PRODUCT_ICON_THEME_ID, ( localize(27908, "Default")), ThemeSettingDefaults.PRODUCT_ICON_THEME));
|
|
80
80
|
themeData.isLoaded = true;
|
|
81
81
|
themeData.extensionData = undefined;
|
|
82
82
|
themeData.watch = false;
|
|
@@ -187,15 +187,15 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
|
|
|
187
187
|
const contentValue = parse(content, parseErrors);
|
|
188
188
|
if (parseErrors.length > 0) {
|
|
189
189
|
return Promise.reject(( new Error(( localize(
|
|
190
|
-
|
|
190
|
+
27909,
|
|
191
191
|
"Problems parsing product icons file: {0}",
|
|
192
192
|
parseErrors.map(e => getParseErrorMessage(e.error)).join(", ")
|
|
193
193
|
)))));
|
|
194
194
|
} else if (getNodeType(contentValue) !== "object") {
|
|
195
|
-
return Promise.reject(( new Error(( localize(
|
|
195
|
+
return Promise.reject(( new Error(( localize(27910, "Invalid format for product icons theme file: Object expected.")))));
|
|
196
196
|
} else if (!contentValue.iconDefinitions || !Array.isArray(contentValue.fonts) || !contentValue.fonts.length) {
|
|
197
197
|
return Promise.reject(( new Error(( localize(
|
|
198
|
-
|
|
198
|
+
27911,
|
|
199
199
|
"Invalid format for product icons theme file: Must contain iconDefinitions and fonts."
|
|
200
200
|
)))));
|
|
201
201
|
}
|
|
@@ -208,13 +208,13 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
|
|
|
208
208
|
if (isString(font.weight) && font.weight.match(fontWeightRegex)) {
|
|
209
209
|
fontWeight = font.weight;
|
|
210
210
|
} else {
|
|
211
|
-
warnings.push(( localize(
|
|
211
|
+
warnings.push(( localize(27912, "Invalid font weight in font '{0}'. Ignoring setting.", font.id)));
|
|
212
212
|
}
|
|
213
213
|
let fontStyle = undefined;
|
|
214
214
|
if (isString(font.style) && font.style.match(fontStyleRegex)) {
|
|
215
215
|
fontStyle = font.style;
|
|
216
216
|
} else {
|
|
217
|
-
warnings.push(( localize(
|
|
217
|
+
warnings.push(( localize(27913, "Invalid font style in font '{0}'. Ignoring setting.", font.id)));
|
|
218
218
|
}
|
|
219
219
|
const sanitizedSrc = [];
|
|
220
220
|
if (Array.isArray(font.src)) {
|
|
@@ -226,7 +226,7 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
|
|
|
226
226
|
format: s.format
|
|
227
227
|
});
|
|
228
228
|
} else {
|
|
229
|
-
warnings.push(( localize(
|
|
229
|
+
warnings.push(( localize(27914, "Invalid font source in font '{0}'. Ignoring source.", font.id)));
|
|
230
230
|
}
|
|
231
231
|
}
|
|
232
232
|
}
|
|
@@ -238,14 +238,14 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
|
|
|
238
238
|
});
|
|
239
239
|
} else {
|
|
240
240
|
warnings.push(( localize(
|
|
241
|
-
|
|
241
|
+
27915,
|
|
242
242
|
"No valid font source in font '{0}'. Ignoring font definition.",
|
|
243
243
|
font.id
|
|
244
244
|
)));
|
|
245
245
|
}
|
|
246
246
|
} else {
|
|
247
247
|
warnings.push(( localize(
|
|
248
|
-
|
|
248
|
+
27916,
|
|
249
249
|
"Missing or invalid font id '{0}'. Skipping font definition.",
|
|
250
250
|
font.id
|
|
251
251
|
)));
|
|
@@ -268,10 +268,10 @@ function _loadProductIconThemeDocument(fileService, location, warnings) {
|
|
|
268
268
|
font
|
|
269
269
|
});
|
|
270
270
|
} else {
|
|
271
|
-
warnings.push(( localize(
|
|
271
|
+
warnings.push(( localize(27917, "Skipping icon definition '{0}'. Unknown font.", iconId)));
|
|
272
272
|
}
|
|
273
273
|
} else {
|
|
274
|
-
warnings.push(( localize(
|
|
274
|
+
warnings.push(( localize(27918, "Skipping icon definition '{0}': Needs to be defined", iconId)));
|
|
275
275
|
}
|
|
276
276
|
}
|
|
277
277
|
return {
|
|
@@ -42,6 +42,7 @@ import { getIconsStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/platf
|
|
|
42
42
|
import { getColorRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
|
|
43
43
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
|
|
44
44
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
|
|
45
|
+
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/confettiColors';
|
|
45
46
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
|
|
46
47
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
|
|
47
48
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
|
|
@@ -292,16 +293,16 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
|
|
|
292
293
|
}
|
|
293
294
|
const keepTheme = await ( new Promise(resolve => {
|
|
294
295
|
this.notificationService.prompt(Severity.Info, ( localize(
|
|
295
|
-
|
|
296
|
+
27919,
|
|
296
297
|
"VS Code has a new default theme: '{0}'.",
|
|
297
298
|
this.getColorTheme().label
|
|
298
299
|
)), [toAction({
|
|
299
300
|
id: "themeUpdated.tryItOut",
|
|
300
|
-
label: ( localize(
|
|
301
|
+
label: ( localize(27920, "Keep It")),
|
|
301
302
|
run: () => resolve(true)
|
|
302
303
|
}), toAction({
|
|
303
304
|
id: "themeUpdated.noThanks",
|
|
304
|
-
label: ( localize(
|
|
305
|
+
label: ( localize(27921, "No Thanks")),
|
|
305
306
|
run: () => resolve(false)
|
|
306
307
|
})], {
|
|
307
308
|
onCancel: () => resolve(false)
|
|
@@ -539,7 +540,7 @@ let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
|
|
|
539
540
|
return this.applyTheme(themeData, settingsTarget);
|
|
540
541
|
} catch (error) {
|
|
541
542
|
throw ( new Error(( localize(
|
|
542
|
-
|
|
543
|
+
27922,
|
|
543
544
|
"Unable to load {0}: {1}",
|
|
544
545
|
themeData.location?.toString(),
|
|
545
546
|
error.message
|
|
@@ -5,6 +5,7 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/json
|
|
|
5
5
|
import { workbenchColorsSchemaId } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
|
|
6
6
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
|
|
7
7
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
|
|
8
|
+
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/confettiColors';
|
|
8
9
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
|
|
9
10
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
|
|
10
11
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
|
|
@@ -133,31 +134,31 @@ const textmateColorSchema = {
|
|
|
133
134
|
},
|
|
134
135
|
settings: {
|
|
135
136
|
type: "object",
|
|
136
|
-
description: ( localize(
|
|
137
|
+
description: ( localize(27953, "Colors and styles for the token.")),
|
|
137
138
|
properties: {
|
|
138
139
|
foreground: {
|
|
139
140
|
type: "string",
|
|
140
|
-
description: ( localize(
|
|
141
|
+
description: ( localize(27954, "Foreground color for the token.")),
|
|
141
142
|
format: "color-hex",
|
|
142
143
|
default: "#ff0000"
|
|
143
144
|
},
|
|
144
145
|
background: {
|
|
145
146
|
type: "string",
|
|
146
|
-
deprecationMessage: ( localize(
|
|
147
|
+
deprecationMessage: ( localize(27955, "Token background colors are currently not supported."))
|
|
147
148
|
},
|
|
148
149
|
fontStyle: {
|
|
149
150
|
type: "string",
|
|
150
151
|
description: ( localize(
|
|
151
|
-
|
|
152
|
+
27956,
|
|
152
153
|
"Font style of the rule: 'italic', 'bold', 'underline', 'strikethrough' or a combination. The empty string unsets inherited settings."
|
|
153
154
|
)),
|
|
154
155
|
pattern: "^(\\s*\\b(italic|bold|underline|strikethrough))*\\s*$",
|
|
155
156
|
patternErrorMessage: ( localize(
|
|
156
|
-
|
|
157
|
+
27957,
|
|
157
158
|
"Font style must be 'italic', 'bold', 'underline', 'strikethrough' or a combination or the empty string."
|
|
158
159
|
)),
|
|
159
160
|
defaultSnippets: [{
|
|
160
|
-
label: ( localize(
|
|
161
|
+
label: ( localize(27958, "None (clear inherited style)")),
|
|
161
162
|
bodyText: "\"\""
|
|
162
163
|
}, {
|
|
163
164
|
body: "italic"
|
|
@@ -194,21 +195,21 @@ const textmateColorSchema = {
|
|
|
194
195
|
fontFamily: {
|
|
195
196
|
type: "string",
|
|
196
197
|
description: ( localize(
|
|
197
|
-
|
|
198
|
+
27959,
|
|
198
199
|
"Font family for the token (e.g., \"Fira Code\", \"JetBrains Mono\")."
|
|
199
200
|
))
|
|
200
201
|
},
|
|
201
202
|
fontSize: {
|
|
202
203
|
type: "number",
|
|
203
204
|
description: ( localize(
|
|
204
|
-
|
|
205
|
+
27960,
|
|
205
206
|
"Font size multiplier for the token (e.g., 1.2 will use 1.2 times the default font size)."
|
|
206
207
|
))
|
|
207
208
|
},
|
|
208
209
|
lineHeight: {
|
|
209
210
|
type: "number",
|
|
210
211
|
description: ( localize(
|
|
211
|
-
|
|
212
|
+
27961,
|
|
212
213
|
"Line height multiplier for the token (e.g., 1.2 will use 1.2 times the default height). If the font size is set and the line height is not explicitly set, the line height will be computed based on the font size."
|
|
213
214
|
))
|
|
214
215
|
}
|
|
@@ -235,10 +236,10 @@ const textmateColorSchema = {
|
|
|
235
236
|
properties: {
|
|
236
237
|
name: {
|
|
237
238
|
type: "string",
|
|
238
|
-
description: ( localize(
|
|
239
|
+
description: ( localize(27962, "Description of the rule."))
|
|
239
240
|
},
|
|
240
241
|
scope: {
|
|
241
|
-
description: ( localize(
|
|
242
|
+
description: ( localize(27963, "Scope selector against which this rule matches.")),
|
|
242
243
|
anyOf: [{
|
|
243
244
|
enum: textMateScopes
|
|
244
245
|
}, {
|
|
@@ -270,26 +271,26 @@ const colorThemeSchema = {
|
|
|
270
271
|
allowTrailingCommas: true,
|
|
271
272
|
properties: {
|
|
272
273
|
colors: {
|
|
273
|
-
description: ( localize(
|
|
274
|
+
description: ( localize(27964, "Colors in the workbench")),
|
|
274
275
|
$ref: workbenchColorsSchemaId,
|
|
275
276
|
additionalProperties: false
|
|
276
277
|
},
|
|
277
278
|
tokenColors: {
|
|
278
279
|
anyOf: [{
|
|
279
280
|
type: "string",
|
|
280
|
-
description: ( localize(
|
|
281
|
+
description: ( localize(27965, "Path to a tmTheme file (relative to the current file)."))
|
|
281
282
|
}, {
|
|
282
|
-
description: ( localize(
|
|
283
|
+
description: ( localize(27966, "Colors for syntax highlighting")),
|
|
283
284
|
$ref: textmateColorsSchemaId
|
|
284
285
|
}]
|
|
285
286
|
},
|
|
286
287
|
semanticHighlighting: {
|
|
287
288
|
type: "boolean",
|
|
288
|
-
description: ( localize(
|
|
289
|
+
description: ( localize(27967, "Whether semantic highlighting should be enabled for this theme."))
|
|
289
290
|
},
|
|
290
291
|
semanticTokenColors: {
|
|
291
292
|
type: "object",
|
|
292
|
-
description: ( localize(
|
|
293
|
+
description: ( localize(27968, "Colors for semantic tokens")),
|
|
293
294
|
$ref: tokenStylingSchemaId
|
|
294
295
|
}
|
|
295
296
|
}
|