@codingame/monaco-vscode-theme-service-override 9.0.3 → 10.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "9.0.3",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.3",
-    "@codingame/monaco-vscode-files-service-override": "9.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0",
+    "@codingame/monaco-vscode-files-service-override": "10.0.0"
   }
 }

package/theme.js

@@ -11,9 +11,9 @@ class StandaloneWorkbenchThemeService extends WorkbenchThemeService {
         };
     }
     setTheme(themeName) {
-        void this.getColorThemes().then(themes => {
+        void this.getColorThemes().then((themes) => {
             setTimeout(() => {
-                void this.setColorTheme(themes.find(theme => theme.settingsId === themeName) ?? themeName, 8 );
+                void this.setColorTheme(themes.find((theme) => theme.settingsId === themeName) ?? themeName, 8 );
             });
         });
     }

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

@@ -1,13 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
-import { KeyChord, KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { equalsIgnoreCase } from 'vscode/vscode/vs/base/common/strings';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { ThemeSettings, ThemeSettingDefaults } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { IWorkbenchThemeService } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
-import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { IExtensionGalleryService, IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { Extensions } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
@@ -27,12 +27,9 @@ import { colorThemeSchemaId } from '../../../services/themes/common/colorThemeSc
 import { isCancellationError, onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { DEFAULT_PRODUCT_ICON_THEME_ID, ProductIconThemeData } from '../../../services/themes/browser/productIconThemeData.js';
-import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
-import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { ThrottledDelayer } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
@@ -40,17 +37,14 @@ import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { IExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { FileIconThemeData } from '../../../services/themes/browser/fileIconThemeData.js';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -63,7 +57,7 @@ import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 var DefaultThemeUpdatedNotificationContribution_1;
-const manageExtensionIcon = registerIcon('theme-selection-manage-extension', Codicon.gear, ( localize(3081, 'Icon for the \'Manage\' action in the theme selection quick pick.')));
+const manageExtensionIcon = registerIcon('theme-selection-manage-extension', Codicon.gear, ( localize(3032, 'Icon for the \'Manage\' action in the theme selection quick pick.')));
 var ConfigureItem;
 ( ((function(ConfigureItem) {
     ConfigureItem["BROWSE_GALLERY"] = "marketplace";
@@ -71,7 +65,7 @@ var ConfigureItem;
     ConfigureItem["CUSTOM_TOP_ENTRY"] = "customTopEntry";
 })(ConfigureItem || (ConfigureItem = {}))));
 let MarketplaceThemesPicker = class MarketplaceThemesPicker {
-    constructor(getMarketplaceColorThemes, marketplaceQuery, extensionGalleryService, extensionManagementService, quickInputService, logService, progressService, paneCompositeService, dialogService) {
+    constructor(getMarketplaceColorThemes, marketplaceQuery, extensionGalleryService, extensionManagementService, quickInputService, logService, progressService, extensionsWorkbenchService, dialogService) {
         this.getMarketplaceColorThemes = getMarketplaceColorThemes;
         this.marketplaceQuery = marketplaceQuery;
         this.extensionGalleryService = extensionGalleryService;
@@ -79,7 +73,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         this.quickInputService = quickInputService;
         this.logService = logService;
         this.progressService = progressService;
-        this.paneCompositeService = paneCompositeService;
+        this.extensionsWorkbenchService = extensionsWorkbenchService;
         this.dialogService = dialogService;
         this._marketplaceExtensions = ( (new Set()));
         this._marketplaceThemes = [];
@@ -171,7 +165,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
             quickpick.matchOnDescription = true;
             quickpick.buttons = [this.quickInputService.backButton];
             quickpick.title = 'Marketplace Themes';
-            quickpick.placeholder = ( localize(3082, "Type to Search More. Select to Install. Up/Down Keys to Preview"));
+            quickpick.placeholder = ( localize(3033, "Type to Search More. Select to Install. Up/Down Keys to Preview"));
             quickpick.canSelectMany = false;
             disposables.add(quickpick.onDidChangeValue(() => this.trigger(quickpick.value)));
             disposables.add(quickpick.onDidAccept(async (_) => {
@@ -192,10 +186,10 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
                 if (isItem(e.item)) {
                     const extensionId = e.item.theme?.extensionData?.extensionId;
                     if (extensionId) {
-                        openExtensionViewlet(this.paneCompositeService, `@id:${extensionId}`);
+                        this.extensionsWorkbenchService.openSearch(`@id:${extensionId}`);
                     }
                     else {
-                        openExtensionViewlet(this.paneCompositeService, `${this.marketplaceQuery} ${quickpick.value}`);
+                        this.extensionsWorkbenchService.openSearch(`${this.marketplaceQuery} ${quickpick.value}`);
                     }
                 }
             }));
@@ -223,7 +217,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
                     items = items.concat({ label: '$(sync~spin) Searching for themes...', id: undefined, alwaysShow: true });
                 }
                 else if (items.length === 0 && this._searchError) {
-                    items = [{ label: `$(error) ${( localize(3083, 'Error while searching for themes: {0}', this._searchError))}`, id: undefined, alwaysShow: true }];
+                    items = [{ label: `$(error) ${( localize(3034, 'Error while searching for themes: {0}', this._searchError))}`, id: undefined, alwaysShow: true }];
                 }
                 const activeItemId = quickpick.activeItems[0]?.id;
                 const newActiveItem = activeItemId ? items.find(i => isItem(i) && i.id === activeItemId) : undefined;
@@ -239,23 +233,23 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         });
     }
     async installExtension(galleryExtension) {
-        openExtensionViewlet(this.paneCompositeService, `@id:${galleryExtension.identifier.id}`);
+        this.extensionsWorkbenchService.openSearch(`@id:${galleryExtension.identifier.id}`);
         const result = await this.dialogService.confirm({
             message: ( localize(
-                3084,
+                3035,
                 "This will install extension '{0}' published by '{1}'. Do you want to continue?",
                 galleryExtension.displayName,
                 galleryExtension.publisherDisplayName
             )),
-            primaryButton: ( localize(3085, "OK"))
+            primaryButton: ( localize(3036, "OK"))
         });
         if (!result.confirmed) {
             return false;
         }
         try {
             await this.progressService.withProgress({
-                location: ProgressLocation.Notification,
-                title: ( localize(3086, "Installing Extension {0}...", galleryExtension.displayName))
+                location: 15 ,
+                title: ( localize(3037, "Installing Extension {0}...", galleryExtension.displayName))
             }, async () => {
                 await this.extensionManagementService.installFromGallery(galleryExtension, {
                     isMachineScoped: false,
@@ -284,17 +278,17 @@ MarketplaceThemesPicker = ( (__decorate([
     ( (__param(4, IQuickInputService))),
     ( (__param(5, ILogService))),
     ( (__param(6, IProgressService))),
-    ( (__param(7, IPaneCompositePartService))),
+    ( (__param(7, IExtensionsWorkbenchService))),
     ( (__param(8, IDialogService)))
 ], MarketplaceThemesPicker)));
 let InstalledThemesPicker = class InstalledThemesPicker {
-    constructor(options, setTheme, getMarketplaceColorThemes, quickInputService, extensionGalleryService, paneCompositeService, extensionResourceLoaderService, instantiationService) {
+    constructor(options, setTheme, getMarketplaceColorThemes, quickInputService, extensionGalleryService, extensionsWorkbenchService, extensionResourceLoaderService, instantiationService) {
         this.options = options;
         this.setTheme = setTheme;
         this.getMarketplaceColorThemes = getMarketplaceColorThemes;
         this.quickInputService = quickInputService;
         this.extensionGalleryService = extensionGalleryService;
-        this.paneCompositeService = paneCompositeService;
+        this.extensionsWorkbenchService = extensionsWorkbenchService;
         this.extensionResourceLoaderService = extensionResourceLoaderService;
         this.instantiationService = instantiationService;
     }
@@ -345,7 +339,7 @@ let InstalledThemesPicker = class InstalledThemesPicker {
                     const theme = quickpick.selectedItems[0];
                     if (!theme || theme.configureItem) {
                         if (!theme || theme.configureItem === ConfigureItem.EXTENSIONS_VIEW) {
-                            openExtensionViewlet(this.paneCompositeService, `${this.options.marketplaceTag} ${quickpick.value}`);
+                            this.extensionsWorkbenchService.openSearch(`${this.options.marketplaceTag} ${quickpick.value}`);
                         }
                         else if (theme.configureItem === ConfigureItem.BROWSE_GALLERY) {
                             if (marketplaceThemePicker) {
@@ -374,10 +368,10 @@ let InstalledThemesPicker = class InstalledThemesPicker {
                     if (isItem(e.item)) {
                         const extensionId = e.item.theme?.extensionData?.extensionId;
                         if (extensionId) {
-                            openExtensionViewlet(this.paneCompositeService, `@id:${extensionId}`);
+                            this.extensionsWorkbenchService.openSearch(`@id:${extensionId}`);
                         }
                         else {
-                            openExtensionViewlet(this.paneCompositeService, `${this.options.marketplaceTag} ${quickpick.value}`);
+                            this.extensionsWorkbenchService.openSearch(`${this.options.marketplaceTag} ${quickpick.value}`);
                         }
                     }
                 }));
@@ -393,7 +387,7 @@ let InstalledThemesPicker = class InstalledThemesPicker {
 InstalledThemesPicker = ( (__decorate([
     ( (__param(3, IQuickInputService))),
     ( (__param(4, IExtensionGalleryService))),
-    ( (__param(5, IPaneCompositePartService))),
+    ( (__param(5, IExtensionsWorkbenchService))),
     ( (__param(6, IExtensionResourceLoaderService))),
     ( (__param(7, IInstantiationService)))
 ], InstalledThemesPicker)));
@@ -402,23 +396,23 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectColorThemeCommandId,
-            title: ( localize2(3087, 'Color Theme')),
+            title: ( localize2(3038, 'Color Theme')),
             category: Categories.Preferences,
             f1: true,
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyT)
+                weight: 200 ,
+                primary: KeyChord(2048  | 41 , 2048  | 50 )
             }
         });
     }
     getTitle(colorScheme) {
         switch (colorScheme) {
-            case ColorScheme.DARK: return ( localize(3088, "Select Color Theme for System Dark Mode"));
-            case ColorScheme.LIGHT: return ( localize(3089, "Select Color Theme for System Light Mode"));
-            case ColorScheme.HIGH_CONTRAST_DARK: return ( localize(3090, "Select Color Theme for High Contrast Dark Mode"));
-            case ColorScheme.HIGH_CONTRAST_LIGHT: return ( localize(3091, "Select Color Theme for High Contrast Light Mode"));
+            case ColorScheme.DARK: return ( localize(3039, "Select Color Theme for System Dark Mode"));
+            case ColorScheme.LIGHT: return ( localize(3040, "Select Color Theme for System Light Mode"));
+            case ColorScheme.HIGH_CONTRAST_DARK: return ( localize(3041, "Select Color Theme for High Contrast Dark Mode"));
+            case ColorScheme.HIGH_CONTRAST_LIGHT: return ( localize(3042, "Select Color Theme for High Contrast Light Mode"));
             default:
-                return ( localize(3092, "Select Color Theme (detect system color mode disabled)"));
+                return ( localize(3043, "Select Color Theme (detect system color mode disabled)"));
         }
     }
     async run(accessor) {
@@ -428,7 +422,7 @@ registerAction2(class extends Action2 {
         let modeConfigureToggle;
         if (preferredColorScheme) {
             modeConfigureToggle = ( (new Toggle({
-                title: ( localize(3093, 'Detect system color mode enabled. Click to configure.')),
+                title: ( localize(3044, 'Detect system color mode enabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
@@ -436,15 +430,15 @@ registerAction2(class extends Action2 {
         }
         else {
             modeConfigureToggle = ( (new Toggle({
-                title: ( localize(3094, 'Detect system color mode disabled. Click to configure.')),
+                title: ( localize(3045, 'Detect system color mode disabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
             })));
         }
         const options = {
-            installMessage: ( localize(3095, "Install Additional Color Themes...")),
-            browseMessage: '$(plus) ' + ( localize(3096, "Browse Additional Color Themes...")),
+            installMessage: ( localize(3046, "Install Additional Color Themes...")),
+            browseMessage: '$(plus) ' + ( localize(3047, "Browse Additional Color Themes...")),
             placeholderMessage: this.getTitle(preferredColorScheme),
             marketplaceTag: 'category:themes',
             toggles: [modeConfigureToggle],
@@ -459,9 +453,9 @@ registerAction2(class extends Action2 {
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const themes = await themeService.getColorThemes();
         const currentTheme = themeService.getColorTheme();
-        const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(3097, "light themes")));
-        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(3098, "dark themes")));
-        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(3099, "high contrast themes")));
+        const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(3048, "light themes")));
+        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(3049, "dark themes")));
+        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(3050, "high contrast themes")));
         let picks;
         switch (preferredColorScheme) {
             case ColorScheme.DARK:
@@ -484,7 +478,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectFileIconThemeCommandId,
-            title: ( localize2(3100, 'File Icon Theme')),
+            title: ( localize2(3051, 'File Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -492,8 +486,8 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(3101, "Install Additional File Icon Themes...")),
-            placeholderMessage: ( localize(3102, "Select File Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(3052, "Install Additional File Icon Themes...")),
+            placeholderMessage: ( localize(3053, "Select File Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setFileIconTheme(theme, settingsTarget);
@@ -501,8 +495,8 @@ registerAction2(class extends Action2 {
         const instantiationService = accessor.get(IInstantiationService);
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [
-            { type: 'separator', label: ( localize(3103, 'file icon themes')) },
-            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(3104, 'None')), description: ( localize(3105, 'Disable File Icons')) },
+            { type: 'separator', label: ( localize(3054, 'file icon themes')) },
+            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(3055, 'None')), description: ( localize(3056, 'Disable File Icons')) },
             ...toEntries(await themeService.getFileIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getFileIconTheme());
@@ -513,7 +507,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectProductIconThemeCommandId,
-            title: ( localize2(3106, 'Product Icon Theme')),
+            title: ( localize2(3057, 'Product Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -521,9 +515,9 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(3107, "Install Additional Product Icon Themes...")),
-            browseMessage: '$(plus) ' + ( localize(3108, "Browse Additional Product Icon Themes...")),
-            placeholderMessage: ( localize(3109, "Select Product Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(3058, "Install Additional Product Icon Themes...")),
+            browseMessage: '$(plus) ' + ( localize(3059, "Browse Additional Product Icon Themes...")),
+            placeholderMessage: ( localize(3060, "Select Product Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:product-icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setProductIconTheme(theme, settingsTarget);
@@ -531,8 +525,8 @@ registerAction2(class extends Action2 {
         const instantiationService = accessor.get(IInstantiationService);
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [
-            { type: 'separator', label: ( localize(3110, 'product icon themes')) },
-            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(3111, 'Default')) },
+            { type: 'separator', label: ( localize(3061, 'product icon themes')) },
+            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(3062, 'Default')) },
             ...toEntries(await themeService.getProductIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getProductIconTheme());
@@ -564,14 +558,6 @@ function configurationEntry(label, configureItem) {
         configureItem: configureItem
     };
 }
-function openExtensionViewlet(paneCompositeService, query) {
-    return paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true).then(viewlet => {
-        if (viewlet) {
-            (viewlet?.getViewPaneContainer()).search(query);
-            viewlet.focus();
-        }
-    });
-}
 function isItem(i) {
     return i['type'] !== 'separator';
 }
@@ -598,13 +584,13 @@ function toEntries(themes, label) {
 }
 const configureButton = {
     iconClass: ThemeIcon.asClassName(manageExtensionIcon),
-    tooltip: ( localize(3112, "Manage Extension")),
+    tooltip: ( localize(3063, "Manage Extension")),
 };
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.generateColorTheme',
-            title: ( localize2(3113, 'Generate Color Theme From Current Settings')),
+            title: ( localize2(3064, 'Generate Color Theme From Current Settings')),
             category: Categories.Developer,
             f1: true
         });
@@ -654,7 +640,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: toggleLightDarkThemesCommandId,
-            title: ( localize2(3114, 'Toggle between Light/Dark Themes')),
+            title: ( localize2(3065, 'Toggle between Light/Dark Themes')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -666,13 +652,13 @@ registerAction2(class extends Action2 {
         const preferencesService = accessor.get(IPreferencesService);
         if (configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
             const message = ( localize(
-                3115,
+                3066,
                 "Cannot toggle between light and dark themes when `{0}` is enabled in settings.",
                 ThemeSettings.DETECT_COLOR_SCHEME
             ));
             notificationService.prompt(Severity$1.Info, message, [
                 {
-                    label: ( localize(3116, "Open Settings")),
+                    label: ( localize(3067, "Open Settings")),
                     run: () => {
                         return preferencesService.openUserSettings({ query: ThemeSettings.DETECT_COLOR_SCHEME });
                     }
@@ -710,7 +696,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: browseColorThemesInMarketplaceCommandId,
-            title: ( localize2(3117, 'Browse Color Themes in Marketplace')),
+            title: ( localize2(3068, 'Browse Color Themes in Marketplace')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -746,13 +732,13 @@ registerAction2(class extends Action2 {
 });
 const ThemesSubMenu = ( (new MenuId('ThemesSubMenu')));
 MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
-    title: ( localize(3118, "Themes")),
+    title: ( localize(3069, "Themes")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-    title: ( localize(3119, "&&Theme")),
+    title: ( localize(3070, "&&Theme")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
@@ -760,21 +746,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectColorThemeCommandId,
-        title: ( localize(3087, 'Color Theme'))
+        title: ( localize(3038, 'Color Theme'))
     },
     order: 1
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectFileIconThemeCommandId,
-        title: ( localize(3120, "File Icon Theme"))
+        title: ( localize(3071, "File Icon Theme"))
     },
     order: 2
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectProductIconThemeCommandId,
-        title: ( localize(3121, "Product Icon Theme"))
+        title: ( localize(3072, "Product Icon Theme"))
     },
     order: 3
 });
@@ -788,15 +774,15 @@ let DefaultThemeUpdatedNotificationContribution = class DefaultThemeUpdatedNotif
         this._commandService = _commandService;
         this._telemetryService = _telemetryService;
         this._hostService = _hostService;
-        if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, StorageScope.APPLICATION)) {
+        if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, -1 )) {
             return;
         }
         setTimeout(async () => {
-            if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, StorageScope.APPLICATION)) {
+            if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, -1 )) {
                 return;
             }
             if (await this._hostService.hadLastFocus()) {
-                this._storageService.store(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, true, StorageScope.APPLICATION, StorageTarget.USER);
+                this._storageService.store(DefaultThemeUpdatedNotificationContribution_1.STORAGE_KEY, true, -1 , 0 );
                 if (this._workbenchThemeService.hasUpdatedDefaultThemes()) {
                     this._showYouGotMigratedNotification();
                 }
@@ -816,20 +802,20 @@ let DefaultThemeUpdatedNotificationContribution = class DefaultThemeUpdatedNotif
         if (newTheme) {
             const choices = [
                 {
-                    label: ( localize(3122, "Keep New Theme")),
+                    label: ( localize(3073, "Keep New Theme")),
                     run: () => {
                         this._writeTelemetry('keepNew');
                     }
                 },
                 {
-                    label: ( localize(3123, "Browse Themes")),
+                    label: ( localize(3074, "Browse Themes")),
                     run: () => {
                         this._writeTelemetry('browse');
                         this._commandService.executeCommand(SelectColorThemeCommandId);
                     }
                 },
                 {
-                    label: ( localize(3124, "Revert")),
+                    label: ( localize(3075, "Revert")),
                     run: async () => {
                         this._writeTelemetry('keepOld');
                         const oldSettingsId = usingLight ? ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD : ThemeSettingDefaults.COLOR_THEME_DARK_OLD;
@@ -841,7 +827,7 @@ let DefaultThemeUpdatedNotificationContribution = class DefaultThemeUpdatedNotif
                 }
             ];
             await this._notificationService.prompt(Severity$1.Info, ( localize(
-                3125,
+                3076,
                 "Visual Studio Code now ships with a new default theme '{0}'. If you prefer, you can switch back to the old theme or try one of the many other color themes available.",
                 newTheme.label
             )), choices, {
@@ -854,20 +840,20 @@ let DefaultThemeUpdatedNotificationContribution = class DefaultThemeUpdatedNotif
         const theme = (await this._workbenchThemeService.getColorThemes()).find(theme => theme.settingsId === newThemeSettingsId);
         if (theme) {
             const choices = [{
-                    label: ( localize(3126, "Try New Theme")),
+                    label: ( localize(3077, "Try New Theme")),
                     run: () => {
                         this._writeTelemetry('tryNew');
                         this._workbenchThemeService.setColorTheme(theme, 'auto');
                     }
                 },
                 {
-                    label: ( localize(3127, "Cancel")),
+                    label: ( localize(3078, "Cancel")),
                     run: () => {
                         this._writeTelemetry('cancel');
                     }
                 }];
             await this._notificationService.prompt(Severity$1.Info, ( localize(
-                3128,
+                3079,
                 "Visual Studio Code now ships with a new default theme '{0}'. Do you want to give it a try?",
                 theme.label
             )), choices, { onCancel: () => this._writeTelemetry('cancel') });
@@ -889,6 +875,6 @@ DefaultThemeUpdatedNotificationContribution = DefaultThemeUpdatedNotificationCon
     ( (__param(5, IHostService)))
 ], DefaultThemeUpdatedNotificationContribution)));
 const workbenchRegistry = ( (Registry.as(Extensions$1.Workbench)));
-workbenchRegistry.registerWorkbenchContribution(DefaultThemeUpdatedNotificationContribution, LifecyclePhase.Eventually);
+workbenchRegistry.registerWorkbenchContribution(DefaultThemeUpdatedNotificationContribution, 4 );
 
 export { manageExtensionIcon };

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

@@ -5,7 +5,6 @@ import { parse, getNodeType } from 'vscode/vscode/vs/base/common/json';
 import { ExtensionData } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 import { getParseErrorMessage } from 'vscode/vscode/vs/base/common/jsonErrorMessages';
 import { asCSSUrl } from 'vscode/vscode/vs/base/browser/dom';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 
 class FileIconThemeData {
@@ -65,7 +64,7 @@ class FileIconThemeData {
         return themeData;
     }
     static fromStorageData(storageService) {
-        const input = storageService.get(FileIconThemeData.STORAGE_KEY, StorageScope.PROFILE);
+        const input = storageService.get(FileIconThemeData.STORAGE_KEY, 0 );
         if (!input) {
             return undefined;
         }
@@ -111,7 +110,7 @@ class FileIconThemeData {
             extensionData: ExtensionData.toJSONObject(this.extensionData),
             watch: this.watch
         });
-        storageService.store(FileIconThemeData.STORAGE_KEY, data, StorageScope.PROFILE, StorageTarget.MACHINE);
+        storageService.store(FileIconThemeData.STORAGE_KEY, data, 0 , 1 );
     }
 }
 class FileIconThemeLoader {
@@ -139,13 +138,13 @@ class FileIconThemeLoader {
             const contentValue = parse(content, errors);
             if (errors.length > 0) {
                 return Promise.reject(( (new Error(( localize(
-                    7248,
+                    6950,
                     "Problems parsing file icons file: {0}",
                     ( (errors.map(e => getParseErrorMessage(e.error)))).join(', ')
                 ))))));
             }
             else if (getNodeType(contentValue) !== 'object') {
-                return Promise.reject(( (new Error(( localize(7249, "Invalid format for file icons theme file: Object expected."))))));
+                return Promise.reject(( (new Error(( localize(6951, "Invalid format for file icons theme file: Object expected."))))));
             }
             return Promise.resolve(contentValue);
         });
@@ -308,12 +307,13 @@ class FileIconThemeLoader {
             });
             cssRules.push(`.show-file-icons .file-icon::before, .show-file-icons .folder-icon::before, .show-file-icons .rootfolder-icon::before { font-family: '${fonts[0].id}'; font-size: ${defaultFontSize}; }`);
         }
+        const emQuad = '\\2001';
         for (const defId in selectorByDefinitionId) {
             const selectors = selectorByDefinitionId[defId];
             const definition = iconThemeDocument.iconDefinitions[defId];
             if (definition) {
                 if (definition.iconPath) {
-                    cssRules.push(`${selectors.join(', ')} { content: ' '; background-image: ${asCSSUrl(resolvePath(definition.iconPath))}; }`);
+                    cssRules.push(`${selectors.join(', ')} { content: '${emQuad}'; background-image: ${asCSSUrl(resolvePath(definition.iconPath))}; }`);
                 }
                 else if (definition.fontCharacter || definition.fontColor) {
                     const body = [];
@@ -343,8 +343,8 @@ class FileIconThemeLoader {
                     const icon = this.languageService.getIcon(languageId);
                     if (icon) {
                         const selector = `.show-file-icons .${escapeCSS(languageId)}-lang-file-icon.file-icon::before`;
-                        cssRules.push(`${selector} { content: ' '; background-image: ${asCSSUrl(icon.dark)}; }`);
-                        cssRules.push(`.vs ${selector} { content: ' '; background-image: ${asCSSUrl(icon.light)}; }`);
+                        cssRules.push(`${selector} { content: '${emQuad}'; background-image: ${asCSSUrl(icon.dark)}; }`);
+                        cssRules.push(`.vs ${selector} { content: '${emQuad}'; background-image: ${asCSSUrl(icon.light)}; }`);
                     }
                 }
             }