@codingame/monaco-vscode-theme-service-override 1.83.1 → 1.83.2
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-theme-service-override",
|
|
3
|
-
"version": "1.83.
|
|
3
|
+
"version": "1.83.2",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"module": "index.js",
|
|
19
19
|
"types": "index.d.ts",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"vscode": "npm:@codingame/monaco-vscode-api@1.83.
|
|
21
|
+
"vscode": "npm:@codingame/monaco-vscode-api@1.83.2",
|
|
22
22
|
"monaco-editor": "0.44.0"
|
|
23
23
|
}
|
|
24
24
|
}
|
|
@@ -44,7 +44,7 @@ const fileIconsEnabledClass = 'file-icons-enabled';
|
|
|
44
44
|
const colorThemeRulesClassName = 'contributedColorTheme';
|
|
45
45
|
const fileIconThemeRulesClassName = 'contributedFileIconTheme';
|
|
46
46
|
const productIconThemeRulesClassName = 'contributedProductIconTheme';
|
|
47
|
-
const themingRegistry = (
|
|
47
|
+
const themingRegistry = ( Registry.as(Extensions.ThemingContribution));
|
|
48
48
|
function validateThemeId(theme) {
|
|
49
49
|
switch (theme) {
|
|
50
50
|
case VS_LIGHT_THEME: return `vs ${defaultThemeExtensionId}-themes-light_vs-json`;
|
|
@@ -68,43 +68,43 @@ let WorkbenchThemeService = class WorkbenchThemeService {
|
|
|
68
68
|
this.hostColorService = hostColorService;
|
|
69
69
|
this.userDataInitializationService = userDataInitializationService;
|
|
70
70
|
this.hasDefaultUpdated = false;
|
|
71
|
-
this.themeExtensionsActivated = (
|
|
71
|
+
this.themeExtensionsActivated = ( new Map());
|
|
72
72
|
this.container = layoutService.container;
|
|
73
|
-
this.settings = (
|
|
74
|
-
this.colorThemeRegistry = (
|
|
75
|
-
this.colorThemeWatcher = (
|
|
76
|
-
this.onColorThemeChange = (
|
|
73
|
+
this.settings = ( new ThemeConfiguration(configurationService));
|
|
74
|
+
this.colorThemeRegistry = ( new ThemeRegistry(colorThemesExtPoint, ColorThemeData.fromExtensionTheme));
|
|
75
|
+
this.colorThemeWatcher = ( new ThemeFileWatcher(fileService, environmentService, this.reloadCurrentColorTheme.bind(this)));
|
|
76
|
+
this.onColorThemeChange = ( new Emitter({ leakWarningThreshold: 400 }));
|
|
77
77
|
this.currentColorTheme = ColorThemeData.createUnloadedTheme('');
|
|
78
|
-
this.colorThemeSequencer = (
|
|
79
|
-
this.fileIconThemeWatcher = (
|
|
78
|
+
this.colorThemeSequencer = ( new Sequencer());
|
|
79
|
+
this.fileIconThemeWatcher = ( new ThemeFileWatcher(
|
|
80
80
|
fileService,
|
|
81
81
|
environmentService,
|
|
82
82
|
this.reloadCurrentFileIconTheme.bind(this)
|
|
83
|
-
))
|
|
84
|
-
this.fileIconThemeRegistry = (
|
|
83
|
+
));
|
|
84
|
+
this.fileIconThemeRegistry = ( new ThemeRegistry(
|
|
85
85
|
fileIconThemesExtPoint,
|
|
86
86
|
FileIconThemeData.fromExtensionTheme,
|
|
87
87
|
true,
|
|
88
88
|
FileIconThemeData.noIconTheme
|
|
89
|
-
))
|
|
90
|
-
this.fileIconThemeLoader = (
|
|
91
|
-
this.onFileIconThemeChange = (
|
|
89
|
+
));
|
|
90
|
+
this.fileIconThemeLoader = ( new FileIconThemeLoader(extensionResourceLoaderService, languageService));
|
|
91
|
+
this.onFileIconThemeChange = ( new Emitter({ leakWarningThreshold: 400 }));
|
|
92
92
|
this.currentFileIconTheme = FileIconThemeData.createUnloadedTheme('');
|
|
93
|
-
this.fileIconThemeSequencer = (
|
|
94
|
-
this.productIconThemeWatcher = (
|
|
93
|
+
this.fileIconThemeSequencer = ( new Sequencer());
|
|
94
|
+
this.productIconThemeWatcher = ( new ThemeFileWatcher(
|
|
95
95
|
fileService,
|
|
96
96
|
environmentService,
|
|
97
97
|
this.reloadCurrentProductIconTheme.bind(this)
|
|
98
|
-
))
|
|
99
|
-
this.productIconThemeRegistry = (
|
|
98
|
+
));
|
|
99
|
+
this.productIconThemeRegistry = ( new ThemeRegistry(
|
|
100
100
|
productIconThemesExtPoint,
|
|
101
101
|
ProductIconThemeData.fromExtensionTheme,
|
|
102
102
|
true,
|
|
103
103
|
ProductIconThemeData.defaultTheme
|
|
104
|
-
))
|
|
105
|
-
this.onProductIconThemeChange = (
|
|
104
|
+
));
|
|
105
|
+
this.onProductIconThemeChange = ( new Emitter());
|
|
106
106
|
this.currentProductIconTheme = ProductIconThemeData.createUnloadedTheme('');
|
|
107
|
-
this.productIconThemeSequencer = (
|
|
107
|
+
this.productIconThemeSequencer = ( new Sequencer());
|
|
108
108
|
let themeData = ColorThemeData.fromStorageData(this.storageService);
|
|
109
109
|
const colorThemeSetting = this.settings.colorTheme;
|
|
110
110
|
if (themeData && colorThemeSetting !== themeData.settingsId && this.settings.isDefaultColorTheme()) {
|
|
@@ -147,7 +147,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
|
|
|
147
147
|
function updateAll() {
|
|
148
148
|
codiconStyleSheet.textContent = iconsStyleSheet.getCSS();
|
|
149
149
|
}
|
|
150
|
-
const delayer = (
|
|
150
|
+
const delayer = ( new RunOnceScheduler(updateAll, 0));
|
|
151
151
|
iconsStyleSheet.onDidChange(() => delayer.schedule());
|
|
152
152
|
delayer.schedule();
|
|
153
153
|
}
|
|
@@ -264,11 +264,11 @@ let WorkbenchThemeService = class WorkbenchThemeService {
|
|
|
264
264
|
await this.setColorTheme(prevColorId, 'auto');
|
|
265
265
|
prevColorId = undefined;
|
|
266
266
|
}
|
|
267
|
-
else if ((
|
|
267
|
+
else if (( event.added.some(t => t.settingsId === this.currentColorTheme.settingsId))) {
|
|
268
268
|
await this.reloadCurrentColorTheme();
|
|
269
269
|
}
|
|
270
270
|
}
|
|
271
|
-
else if ((
|
|
271
|
+
else if (( event.removed.some(t => t.settingsId === this.currentColorTheme.settingsId))) {
|
|
272
272
|
prevColorId = this.currentColorTheme.id;
|
|
273
273
|
const defaultTheme = this.colorThemeRegistry.findThemeBySettingsId(ThemeSettingDefaults.COLOR_THEME_DARK);
|
|
274
274
|
await this.setColorTheme(defaultTheme, 'auto');
|
|
@@ -282,11 +282,11 @@ let WorkbenchThemeService = class WorkbenchThemeService {
|
|
|
282
282
|
await this.setFileIconTheme(prevFileIconId, 'auto');
|
|
283
283
|
prevFileIconId = undefined;
|
|
284
284
|
}
|
|
285
|
-
else if ((
|
|
285
|
+
else if (( event.added.some(t => t.settingsId === this.currentFileIconTheme.settingsId))) {
|
|
286
286
|
await this.reloadCurrentFileIconTheme();
|
|
287
287
|
}
|
|
288
288
|
}
|
|
289
|
-
else if ((
|
|
289
|
+
else if (( event.removed.some(t => t.settingsId === this.currentFileIconTheme.settingsId))) {
|
|
290
290
|
prevFileIconId = this.currentFileIconTheme.id;
|
|
291
291
|
await this.setFileIconTheme(DEFAULT_FILE_ICON_THEME_ID, 'auto');
|
|
292
292
|
}
|
|
@@ -299,11 +299,11 @@ let WorkbenchThemeService = class WorkbenchThemeService {
|
|
|
299
299
|
await this.setProductIconTheme(prevProductIconId, 'auto');
|
|
300
300
|
prevProductIconId = undefined;
|
|
301
301
|
}
|
|
302
|
-
else if ((
|
|
302
|
+
else if (( event.added.some(t => t.settingsId === this.currentProductIconTheme.settingsId))) {
|
|
303
303
|
await this.reloadCurrentProductIconTheme();
|
|
304
304
|
}
|
|
305
305
|
}
|
|
306
|
-
else if ((
|
|
306
|
+
else if (( event.removed.some(t => t.settingsId === this.currentProductIconTheme.settingsId))) {
|
|
307
307
|
prevProductIconId = this.currentProductIconTheme.id;
|
|
308
308
|
await this.setProductIconTheme(DEFAULT_PRODUCT_ICON_THEME_ID, 'auto');
|
|
309
309
|
}
|
|
@@ -462,10 +462,10 @@ let WorkbenchThemeService = class WorkbenchThemeService {
|
|
|
462
462
|
});
|
|
463
463
|
}
|
|
464
464
|
updateDynamicCSSRules(themeData) {
|
|
465
|
-
const cssRules = (
|
|
465
|
+
const cssRules = ( new Set());
|
|
466
466
|
const ruleCollector = {
|
|
467
467
|
addRule: (rule) => {
|
|
468
|
-
if (!(
|
|
468
|
+
if (!( cssRules.has(rule))) {
|
|
469
469
|
cssRules.add(rule);
|
|
470
470
|
}
|
|
471
471
|
}
|
|
@@ -476,7 +476,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
|
|
|
476
476
|
for (const item of getColorRegistry().getColors()) {
|
|
477
477
|
const color = themeData.getColor(item.id, true);
|
|
478
478
|
if (color) {
|
|
479
|
-
colorVariables.push(`${asCssVariableName(item.id)}: ${(
|
|
479
|
+
colorVariables.push(`${asCssVariableName(item.id)}: ${( color.toString())};`);
|
|
480
480
|
}
|
|
481
481
|
}
|
|
482
482
|
ruleCollector.addRule(`.monaco-workbench { ${colorVariables.join('\n')} }`);
|
|
@@ -697,20 +697,20 @@ let WorkbenchThemeService = class WorkbenchThemeService {
|
|
|
697
697
|
}
|
|
698
698
|
}
|
|
699
699
|
};
|
|
700
|
-
WorkbenchThemeService = (
|
|
701
|
-
(
|
|
702
|
-
(
|
|
703
|
-
(
|
|
704
|
-
(
|
|
705
|
-
(
|
|
706
|
-
(
|
|
707
|
-
(
|
|
708
|
-
(
|
|
709
|
-
(
|
|
710
|
-
(
|
|
711
|
-
(
|
|
712
|
-
(
|
|
713
|
-
], WorkbenchThemeService))
|
|
700
|
+
WorkbenchThemeService = ( __decorate([
|
|
701
|
+
( __param(0, IExtensionService)),
|
|
702
|
+
( __param(1, IStorageService)),
|
|
703
|
+
( __param(2, IConfigurationService)),
|
|
704
|
+
( __param(3, ITelemetryService)),
|
|
705
|
+
( __param(4, IBrowserWorkbenchEnvironmentService)),
|
|
706
|
+
( __param(5, IFileService)),
|
|
707
|
+
( __param(6, IExtensionResourceLoaderService)),
|
|
708
|
+
( __param(7, IWorkbenchLayoutService)),
|
|
709
|
+
( __param(8, ILogService)),
|
|
710
|
+
( __param(9, IHostColorSchemeService)),
|
|
711
|
+
( __param(10, IUserDataInitializationService)),
|
|
712
|
+
( __param(11, ILanguageService))
|
|
713
|
+
], WorkbenchThemeService));
|
|
714
714
|
class ThemeFileWatcher {
|
|
715
715
|
constructor(fileService, environmentService, onUpdate) {
|
|
716
716
|
this.fileService = fileService;
|