@codingame/monaco-vscode-theme-service-override 3.2.2 → 4.0.0

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,3 +1,5 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+
 var ConfirmResult;
 ( (function(ConfirmResult) {
     ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2",
-    "@codingame/monaco-vscode-files-service-override": "3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0",
+    "@codingame/monaco-vscode-files-service-override": "4.0.0"
   }
 }

package/vscode/src/vs/workbench/contrib/themes/browser/themes.contribution.js

@@ -8,7 +8,17 @@ import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommon
 import { IWorkbenchThemeService, ThemeSettings, ThemeSettingDefaults } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { IExtensionGalleryService, IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
-import { Extensions } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { Extensions } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { Color } from 'vscode/vscode/vs/base/common/color';
 import { ColorScheme, isHighContrast } from 'vscode/vscode/vs/platform/theme/common/theme';

package/vscode/src/vs/workbench/services/themes/browser/workbenchThemeService.js

@@ -12,7 +12,7 @@ import { ColorThemeData } from '../common/colorThemeData.js';
 import { Extensions } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { registerFileIconThemeSchemas } from '../common/fileIconThemeSchema.js';
-import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { FileIconThemeData, FileIconThemeLoader } from './fileIconThemeData.js';
 import { createStyleSheet } from 'vscode/vscode/vs/base/browser/dom';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
@@ -33,7 +33,17 @@ import { IHostColorSchemeService } from 'vscode/vscode/vs/workbench/services/the
 import { Sequencer, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { IUserDataInitializationService } from 'vscode/vscode/vs/workbench/services/userData/browser/userDataInit';
 import { getIconsStyleSheet } from 'vscode/vscode/vs/platform/theme/browser/iconsStyleSheet';
-import { getColorRegistry, asCssVariableName } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { getColorRegistry, asCssVariableName } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 
@@ -58,8 +68,9 @@ function validateThemeId(theme) {
 const colorThemesExtPoint = registerColorThemeExtensionPoint();
 const fileIconThemesExtPoint = registerFileIconThemeExtensionPoint();
 const productIconThemesExtPoint = registerProductIconThemeExtensionPoint();
-let WorkbenchThemeService = class WorkbenchThemeService {
+let WorkbenchThemeService = class WorkbenchThemeService extends Disposable {
     constructor(extensionService, storageService, configurationService, telemetryService, environmentService, fileService, extensionResourceLoaderService, layoutService, logService, hostColorService, userDataInitializationService, languageService) {
+        super();
         this.storageService = storageService;
         this.configurationService = configurationService;
         this.telemetryService = telemetryService;
@@ -68,41 +79,42 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         this.logService = logService;
         this.hostColorService = hostColorService;
         this.userDataInitializationService = userDataInitializationService;
+        this.languageService = languageService;
         this.hasDefaultUpdated = false;
         this.themeExtensionsActivated = ( new Map());
         this.container = layoutService.mainContainer;
         this.settings = ( new ThemeConfiguration(configurationService));
-        this.colorThemeRegistry = ( new ThemeRegistry(colorThemesExtPoint, ColorThemeData.fromExtensionTheme));
-        this.colorThemeWatcher = ( new ThemeFileWatcher(fileService, environmentService, this.reloadCurrentColorTheme.bind(this)));
+        this.colorThemeRegistry = this._register(( new ThemeRegistry(colorThemesExtPoint, ColorThemeData.fromExtensionTheme)));
+        this.colorThemeWatcher = this._register(( new ThemeFileWatcher(fileService, environmentService, this.reloadCurrentColorTheme.bind(this))));
         this.onColorThemeChange = ( new Emitter({ leakWarningThreshold: 400 }));
         this.currentColorTheme = ColorThemeData.createUnloadedTheme('');
         this.colorThemeSequencer = ( new Sequencer());
-        this.fileIconThemeWatcher = ( new ThemeFileWatcher(
+        this.fileIconThemeWatcher = this._register(( new ThemeFileWatcher(
             fileService,
             environmentService,
             this.reloadCurrentFileIconTheme.bind(this)
-        ));
-        this.fileIconThemeRegistry = ( new ThemeRegistry(
+        )));
+        this.fileIconThemeRegistry = this._register(( new ThemeRegistry(
             fileIconThemesExtPoint,
             FileIconThemeData.fromExtensionTheme,
             true,
             FileIconThemeData.noIconTheme
-        ));
+        )));
         this.fileIconThemeLoader = ( new FileIconThemeLoader(extensionResourceLoaderService, languageService));
         this.onFileIconThemeChange = ( new Emitter({ leakWarningThreshold: 400 }));
         this.currentFileIconTheme = FileIconThemeData.createUnloadedTheme('');
         this.fileIconThemeSequencer = ( new Sequencer());
-        this.productIconThemeWatcher = ( new ThemeFileWatcher(
+        this.productIconThemeWatcher = this._register(( new ThemeFileWatcher(
             fileService,
             environmentService,
             this.reloadCurrentProductIconTheme.bind(this)
-        ));
-        this.productIconThemeRegistry = ( new ThemeRegistry(
+        )));
+        this.productIconThemeRegistry = this._register(( new ThemeRegistry(
             productIconThemesExtPoint,
             ProductIconThemeData.fromExtensionTheme,
             true,
             ProductIconThemeData.defaultTheme
-        ));
+        )));
         this.onProductIconThemeChange = ( new Emitter());
         this.currentProductIconTheme = ProductIconThemeData.createUnloadedTheme('');
         this.productIconThemeSequencer = ( new Sequencer());
@@ -144,12 +156,12 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         });
         const codiconStyleSheet = createStyleSheet();
         codiconStyleSheet.id = 'codiconStyles';
-        const iconsStyleSheet = getIconsStyleSheet(this);
+        const iconsStyleSheet = this._register(getIconsStyleSheet(this));
         function updateAll() {
             codiconStyleSheet.textContent = iconsStyleSheet.getCSS();
         }
-        const delayer = ( new RunOnceScheduler(updateAll, 0));
-        iconsStyleSheet.onDidChange(() => delayer.schedule());
+        const delayer = this._register(( new RunOnceScheduler(updateAll, 0)));
+        this._register(iconsStyleSheet.onDidChange(() => delayer.schedule()));
         delayer.schedule();
     }
     initialize() {
@@ -204,7 +216,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         return Promise.all([initializeColorTheme(), initializeFileIconTheme(), initializeProductIconTheme()]);
     }
     installConfigurationListener() {
-        this.configurationService.onDidChangeConfiguration(e => {
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
             let lazyPreferredColorScheme = null;
             const getPreferredColorScheme = () => {
                 if (lazyPreferredColorScheme === null) {
@@ -255,11 +267,11 @@ let WorkbenchThemeService = class WorkbenchThemeService {
                     this.onColorThemeChange.fire(this.currentColorTheme);
                 }
             }
-        });
+        }));
     }
     installRegistryListeners() {
         let prevColorId = undefined;
-        this.colorThemeRegistry.onDidChange(async (event) => {
+        this._register(this.colorThemeRegistry.onDidChange(async (event) => {
             updateColorThemeConfigurationSchemas(event.themes);
             if (await this.restoreColorTheme()) {
                 if (this.currentColorTheme.settingsId === ThemeSettingDefaults.COLOR_THEME_DARK && !isUndefined(prevColorId) && (await this.colorThemeRegistry.findThemeById(prevColorId))) {
@@ -275,9 +287,9 @@ let WorkbenchThemeService = class WorkbenchThemeService {
                 const defaultTheme = this.colorThemeRegistry.findThemeBySettingsId(ThemeSettingDefaults.COLOR_THEME_DARK);
                 await this.setColorTheme(defaultTheme, 'auto');
             }
-        });
+        }));
         let prevFileIconId = undefined;
-        this.fileIconThemeRegistry.onDidChange(async (event) => {
+        this._register(this._register(this.fileIconThemeRegistry.onDidChange(async (event) => {
             updateFileIconThemeConfigurationSchemas(event.themes);
             if (await this.restoreFileIconTheme()) {
                 if (this.currentFileIconTheme.id === DEFAULT_FILE_ICON_THEME_ID && !isUndefined(prevFileIconId) && this.fileIconThemeRegistry.findThemeById(prevFileIconId)) {
@@ -292,9 +304,9 @@ let WorkbenchThemeService = class WorkbenchThemeService {
                 prevFileIconId = this.currentFileIconTheme.id;
                 await this.setFileIconTheme(DEFAULT_FILE_ICON_THEME_ID, 'auto');
             }
-        });
+        })));
         let prevProductIconId = undefined;
-        this.productIconThemeRegistry.onDidChange(async (event) => {
+        this._register(this.productIconThemeRegistry.onDidChange(async (event) => {
             updateProductIconThemeConfigurationSchemas(event.themes);
             if (await this.restoreProductIconTheme()) {
                 if (this.currentProductIconTheme.id === DEFAULT_PRODUCT_ICON_THEME_ID && !isUndefined(prevProductIconId) && this.productIconThemeRegistry.findThemeById(prevProductIconId)) {
@@ -309,7 +321,8 @@ let WorkbenchThemeService = class WorkbenchThemeService {
                 prevProductIconId = this.currentProductIconTheme.id;
                 await this.setProductIconTheme(DEFAULT_PRODUCT_ICON_THEME_ID, 'auto');
             }
-        });
+        }));
+        this._register(this.languageService.onDidChange(() => this.reloadCurrentFileIconTheme()));
         return Promise.all([this.getColorThemes(), this.getFileIconThemes(), this.getProductIconThemes()]).then(([ct, fit, pit]) => {
             updateColorThemeConfigurationSchemas(ct);
             updateFileIconThemeConfigurationSchemas(fit);
@@ -317,7 +330,7 @@ let WorkbenchThemeService = class WorkbenchThemeService {
         });
     }
     installPreferredSchemeListener() {
-        this.hostColorService.onDidChangeColorScheme(() => this.handlePreferredSchemeUpdated());
+        this._register(this.hostColorService.onDidChangeColorScheme(() => this.handlePreferredSchemeUpdated()));
     }
     async handlePreferredSchemeUpdated() {
         const scheme = this.getPreferredColorScheme();

package/vscode/src/vs/workbench/services/themes/common/colorThemeData.js

@@ -6,7 +6,17 @@ import { convertSettings } from './themeCompatibility.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { isUndefined, isObject, isString, isBoolean } from 'vscode/vscode/vs/base/common/types';
 import { extname, joinPath, dirname } from 'vscode/vscode/vs/base/common/resources';
-import { Extensions, editorForeground, editorBackground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { Extensions } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorForeground, editorBackground } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { getThemeTypeSelector } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { getParseErrorMessage } from 'vscode/vscode/vs/base/common/jsonErrorMessages';

package/vscode/src/vs/workbench/services/themes/common/colorThemeSchema.js

@@ -1,7 +1,17 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { workbenchColorsSchemaId } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { workbenchColorsSchemaId } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { tokenStylingSchemaId } from 'vscode/vscode/vs/platform/theme/common/tokenClassificationRegistry';
 
 const textMateScopes = [

package/vscode/src/vs/workbench/services/themes/common/themeCompatibility.js

@@ -1,5 +1,15 @@
 import { Color } from 'vscode/vscode/vs/base/common/color';
-import { editorBackground, editorForeground, editorSelectionBackground, editorInactiveSelection, editorSelectionHighlight, editorFindMatchHighlight, editorFindMatch, editorHoverHighlight, editorFindRangeHighlight } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorBackground, editorForeground, editorSelectionBackground, editorInactiveSelection, editorSelectionHighlight, editorFindMatchHighlight, editorFindMatch, editorHoverHighlight, editorFindRangeHighlight } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { editorLineHighlight, editorRangeHighlight, editorCursorForeground, editorWhitespaces, editorIndentGuide1, editorActiveIndentGuide1 } from 'vscode/vscode/vs/editor/common/core/editorColorRegistry';
 
 const settingToColorIdMapping = {};

package/vscode/src/vs/workbench/services/themes/common/themeConfiguration.js

@@ -3,7 +3,17 @@ import { isUndefined } from 'vscode/vscode/vs/base/common/types';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { textmateColorsSchemaId, textmateColorGroupSchemaId } from './colorThemeSchema.js';
-import { workbenchColorsSchemaId } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { workbenchColorsSchemaId } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { tokenStylingSchemaId } from 'vscode/vscode/vs/platform/theme/common/tokenClassificationRegistry';
 import { ThemeSettingDefaults, ThemeSettings } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';

package/vscode/src/vs/workbench/services/themes/common/themeExtensionPoints.js

@@ -219,6 +219,9 @@ class ThemeRegistry {
         this.extensionThemes = [];
         this.initialize();
     }
+    dispose() {
+        this.themesExtPoint.setHandler(() => { });
+    }
     initialize() {
         this.themesExtPoint.setHandler((extensions, delta) => {
             const previousIds = {};