@codingame/monaco-vscode-theme-service-override 8.0.4 → 9.0.0

package/package.json

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

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

@@ -63,7 +63,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(3076, 'Icon for the \'Manage\' action in the theme selection quick pick.')));
+const manageExtensionIcon = registerIcon('theme-selection-manage-extension', Codicon.gear, ( localize(2599, 'Icon for the \'Manage\' action in the theme selection quick pick.')));
 var ConfigureItem;
 ( ((function(ConfigureItem) {
     ConfigureItem["BROWSE_GALLERY"] = "marketplace";
@@ -163,91 +163,91 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
     }
     openQuickPick(value, currentTheme, selectTheme) {
         let result = undefined;
-        return (
-             (new Promise((s, _) => {
-                const quickpick = this.quickInputService.createQuickPick();
-                quickpick.items = [];
-                quickpick.sortByLabel = false;
-                quickpick.matchOnDescription = true;
-                quickpick.buttons = [this.quickInputService.backButton];
-                quickpick.title = 'Marketplace Themes';
-                quickpick.placeholder = ( localize(3077, "Type to Search More. Select to Install. Up/Down Keys to Preview"));
-                quickpick.canSelectMany = false;
-                quickpick.onDidChangeValue(() => this.trigger(quickpick.value));
-                quickpick.onDidAccept(async (_) => {
-                    const themeItem = quickpick.selectedItems[0];
-                    if (themeItem?.galleryExtension) {
-                        result = 'selected';
-                        quickpick.hide();
-                        const success = await this.installExtension(themeItem.galleryExtension);
-                        if (success) {
-                            selectTheme(themeItem.theme, true);
-                        }
-                        else {
-                            selectTheme(currentTheme, true);
-                        }
-                    }
-                });
-                quickpick.onDidTriggerItemButton(e => {
-                    if (isItem(e.item)) {
-                        const extensionId = e.item.theme?.extensionData?.extensionId;
-                        if (extensionId) {
-                            openExtensionViewlet(this.paneCompositeService, `@id:${extensionId}`);
-                        }
-                        else {
-                            openExtensionViewlet(this.paneCompositeService, `${this.marketplaceQuery} ${quickpick.value}`);
-                        }
+        const disposables = ( (new DisposableStore()));
+        return ( (new Promise((s, _) => {
+            const quickpick = disposables.add(this.quickInputService.createQuickPick());
+            quickpick.items = [];
+            quickpick.sortByLabel = false;
+            quickpick.matchOnDescription = true;
+            quickpick.buttons = [this.quickInputService.backButton];
+            quickpick.title = 'Marketplace Themes';
+            quickpick.placeholder = ( localize(2600, "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 (_) => {
+                const themeItem = quickpick.selectedItems[0];
+                if (themeItem?.galleryExtension) {
+                    result = 'selected';
+                    quickpick.hide();
+                    const success = await this.installExtension(themeItem.galleryExtension);
+                    if (success) {
+                        selectTheme(themeItem.theme, true);
                     }
-                });
-                quickpick.onDidChangeActive(themes => {
-                    if (result === undefined) {
-                        selectTheme(themes[0]?.theme, false);
-                    }
-                });
-                quickpick.onDidHide(() => {
-                    if (result === undefined) {
+                    else {
                         selectTheme(currentTheme, true);
-                        result = 'cancelled';
-                    }
-                    quickpick.dispose();
-                    s(result);
-                });
-                quickpick.onDidTriggerButton(e => {
-                    if (e === this.quickInputService.backButton) {
-                        result = 'back';
-                        quickpick.hide();
-                    }
-                });
-                this.onDidChange(() => {
-                    let items = this.themes;
-                    if (this._searchOngoing) {
-                        items = items.concat({ label: '$(sync~spin) Searching for themes...', id: undefined, alwaysShow: true });
                     }
-                    else if (items.length === 0 && this._searchError) {
-                        items = [{ label: `$(error) ${( localize(3078, 'Error while searching for themes: {0}', this._searchError))}`, id: undefined, alwaysShow: true }];
+                }
+            }));
+            disposables.add(quickpick.onDidTriggerItemButton(e => {
+                if (isItem(e.item)) {
+                    const extensionId = e.item.theme?.extensionData?.extensionId;
+                    if (extensionId) {
+                        openExtensionViewlet(this.paneCompositeService, `@id:${extensionId}`);
                     }
-                    const activeItemId = quickpick.activeItems[0]?.id;
-                    const newActiveItem = activeItemId ? items.find(i => isItem(i) && i.id === activeItemId) : undefined;
-                    quickpick.items = items;
-                    if (newActiveItem) {
-                        quickpick.activeItems = [newActiveItem];
+                    else {
+                        openExtensionViewlet(this.paneCompositeService, `${this.marketplaceQuery} ${quickpick.value}`);
                     }
-                });
-                this.trigger(value);
-                quickpick.show();
-            }))
-        );
+                }
+            }));
+            disposables.add(quickpick.onDidChangeActive(themes => {
+                if (result === undefined) {
+                    selectTheme(themes[0]?.theme, false);
+                }
+            }));
+            disposables.add(quickpick.onDidHide(() => {
+                if (result === undefined) {
+                    selectTheme(currentTheme, true);
+                    result = 'cancelled';
+                }
+                s(result);
+            }));
+            disposables.add(quickpick.onDidTriggerButton(e => {
+                if (e === this.quickInputService.backButton) {
+                    result = 'back';
+                    quickpick.hide();
+                }
+            }));
+            disposables.add(this.onDidChange(() => {
+                let items = this.themes;
+                if (this._searchOngoing) {
+                    items = items.concat({ label: '$(sync~spin) Searching for themes...', id: undefined, alwaysShow: true });
+                }
+                else if (items.length === 0 && this._searchError) {
+                    items = [{ label: `$(error) ${( localize(2601, '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;
+                quickpick.items = items;
+                if (newActiveItem) {
+                    quickpick.activeItems = [newActiveItem];
+                }
+            }));
+            this.trigger(value);
+            quickpick.show();
+        }))).finally(() => {
+            disposables.dispose();
+        });
     }
     async installExtension(galleryExtension) {
         openExtensionViewlet(this.paneCompositeService, `@id:${galleryExtension.identifier.id}`);
         const result = await this.dialogService.confirm({
             message: ( localize(
-                3079,
+                2602,
                 "This will install extension '{0}' published by '{1}'. Do you want to continue?",
                 galleryExtension.displayName,
                 galleryExtension.publisherDisplayName
             )),
-            primaryButton: ( localize(3080, "OK"))
+            primaryButton: ( localize(2603, "OK"))
         });
         if (!result.confirmed) {
             return false;
@@ -255,7 +255,7 @@ let MarketplaceThemesPicker = class MarketplaceThemesPicker {
         try {
             await this.progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(3081, "Installing Extension {0}...", galleryExtension.displayName))
+                title: ( localize(2604, "Installing Extension {0}...", galleryExtension.displayName))
             }, async () => {
                 await this.extensionManagementService.installFromGallery(galleryExtension, {
                     isMachineScoped: false,
@@ -324,68 +324,67 @@ let InstalledThemesPicker = class InstalledThemesPicker {
             }, applyTheme ? 0 : 200);
         };
         const pickInstalledThemes = (activeItemId) => {
-            return (
-                 (new Promise((s, _) => {
-                    let isCompleted = false;
-                    const disposables = ( (new DisposableStore()));
-                    const autoFocusIndex = picks.findIndex(p => isItem(p) && p.id === activeItemId);
-                    const quickpick = this.quickInputService.createQuickPick();
-                    quickpick.items = picks;
-                    quickpick.title = this.options.title;
-                    quickpick.description = this.options.description;
-                    quickpick.placeholder = this.options.placeholderMessage;
-                    quickpick.activeItems = [picks[autoFocusIndex]];
-                    quickpick.canSelectMany = false;
-                    quickpick.toggles = this.options.toggles;
-                    quickpick.toggles?.forEach(toggle => {
-                        toggle.onChange(() => this.options.onToggle?.(toggle, quickpick), undefined, disposables);
-                    });
-                    quickpick.matchOnDescription = true;
-                    quickpick.onDidAccept(async (_) => {
-                        isCompleted = true;
-                        const theme = quickpick.selectedItems[0];
-                        if (!theme || theme.configureItem) {
-                            if (!theme || theme.configureItem === ConfigureItem.EXTENSIONS_VIEW) {
-                                openExtensionViewlet(this.paneCompositeService, `${this.options.marketplaceTag} ${quickpick.value}`);
-                            }
-                            else if (theme.configureItem === ConfigureItem.BROWSE_GALLERY) {
-                                if (marketplaceThemePicker) {
-                                    const res = await marketplaceThemePicker.openQuickPick(quickpick.value, currentTheme, selectTheme);
-                                    if (res === 'back') {
-                                        await pickInstalledThemes(undefined);
-                                    }
+            const disposables = ( (new DisposableStore()));
+            return ( (new Promise((s, _) => {
+                let isCompleted = false;
+                const autoFocusIndex = picks.findIndex(p => isItem(p) && p.id === activeItemId);
+                const quickpick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
+                quickpick.items = picks;
+                quickpick.title = this.options.title;
+                quickpick.description = this.options.description;
+                quickpick.placeholder = this.options.placeholderMessage;
+                quickpick.activeItems = [picks[autoFocusIndex]];
+                quickpick.canSelectMany = false;
+                quickpick.toggles = this.options.toggles;
+                quickpick.toggles?.forEach(toggle => {
+                    disposables.add(toggle.onChange(() => this.options.onToggle?.(toggle, quickpick)));
+                });
+                quickpick.matchOnDescription = true;
+                disposables.add(quickpick.onDidAccept(async (_) => {
+                    isCompleted = true;
+                    const theme = quickpick.selectedItems[0];
+                    if (!theme || theme.configureItem) {
+                        if (!theme || theme.configureItem === ConfigureItem.EXTENSIONS_VIEW) {
+                            openExtensionViewlet(this.paneCompositeService, `${this.options.marketplaceTag} ${quickpick.value}`);
+                        }
+                        else if (theme.configureItem === ConfigureItem.BROWSE_GALLERY) {
+                            if (marketplaceThemePicker) {
+                                const res = await marketplaceThemePicker.openQuickPick(quickpick.value, currentTheme, selectTheme);
+                                if (res === 'back') {
+                                    await pickInstalledThemes(undefined);
                                 }
                             }
                         }
-                        else {
-                            selectTheme(theme.theme, true);
-                        }
-                        quickpick.hide();
+                    }
+                    else {
+                        selectTheme(theme.theme, true);
+                    }
+                    quickpick.hide();
+                    s();
+                }));
+                disposables.add(quickpick.onDidChangeActive(themes => selectTheme(themes[0]?.theme, false)));
+                disposables.add(quickpick.onDidHide(() => {
+                    if (!isCompleted) {
+                        selectTheme(currentTheme, true);
                         s();
-                    });
-                    quickpick.onDidChangeActive(themes => selectTheme(themes[0]?.theme, false));
-                    quickpick.onDidHide(() => {
-                        if (!isCompleted) {
-                            selectTheme(currentTheme, true);
-                            s();
+                    }
+                    quickpick.dispose();
+                }));
+                disposables.add(quickpick.onDidTriggerItemButton(e => {
+                    if (isItem(e.item)) {
+                        const extensionId = e.item.theme?.extensionData?.extensionId;
+                        if (extensionId) {
+                            openExtensionViewlet(this.paneCompositeService, `@id:${extensionId}`);
                         }
-                        quickpick.dispose();
-                        disposables.dispose();
-                    });
-                    quickpick.onDidTriggerItemButton(e => {
-                        if (isItem(e.item)) {
-                            const extensionId = e.item.theme?.extensionData?.extensionId;
-                            if (extensionId) {
-                                openExtensionViewlet(this.paneCompositeService, `@id:${extensionId}`);
-                            }
-                            else {
-                                openExtensionViewlet(this.paneCompositeService, `${this.options.marketplaceTag} ${quickpick.value}`);
-                            }
+                        else {
+                            openExtensionViewlet(this.paneCompositeService, `${this.options.marketplaceTag} ${quickpick.value}`);
                         }
-                    });
-                    quickpick.show();
-                }))
-            );
+                    }
+                }));
+                quickpick.show();
+            }))).finally(() => {
+                disposables.dispose();
+            });
         };
         await pickInstalledThemes(currentTheme.id);
         marketplaceThemePicker?.dispose();
@@ -403,7 +402,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectColorThemeCommandId,
-            title: ( localize2(3082, 'Color Theme')),
+            title: ( localize2(2605, 'Color Theme')),
             category: Categories.Preferences,
             f1: true,
             keybinding: {
@@ -414,12 +413,12 @@ registerAction2(class extends Action2 {
     }
     getTitle(colorScheme) {
         switch (colorScheme) {
-            case ColorScheme.DARK: return ( localize(3083, "Select Color Theme for System Dark Mode"));
-            case ColorScheme.LIGHT: return ( localize(3084, "Select Color Theme for System Light Mode"));
-            case ColorScheme.HIGH_CONTRAST_DARK: return ( localize(3085, "Select Color Theme for High Contrast Dark Mode"));
-            case ColorScheme.HIGH_CONTRAST_LIGHT: return ( localize(3086, "Select Color Theme for High Contrast Light Mode"));
+            case ColorScheme.DARK: return ( localize(2606, "Select Color Theme for System Dark Mode"));
+            case ColorScheme.LIGHT: return ( localize(2607, "Select Color Theme for System Light Mode"));
+            case ColorScheme.HIGH_CONTRAST_DARK: return ( localize(2608, "Select Color Theme for High Contrast Dark Mode"));
+            case ColorScheme.HIGH_CONTRAST_LIGHT: return ( localize(2609, "Select Color Theme for High Contrast Light Mode"));
             default:
-                return ( localize(3087, "Select Color Theme (detect system color mode disabled)"));
+                return ( localize(2610, "Select Color Theme (detect system color mode disabled)"));
         }
     }
     async run(accessor) {
@@ -429,7 +428,7 @@ registerAction2(class extends Action2 {
         let modeConfigureToggle;
         if (preferredColorScheme) {
             modeConfigureToggle = ( (new Toggle({
-                title: ( localize(3088, 'Detect system color mode enabled. Click to configure.')),
+                title: ( localize(2611, 'Detect system color mode enabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
@@ -437,15 +436,15 @@ registerAction2(class extends Action2 {
         }
         else {
             modeConfigureToggle = ( (new Toggle({
-                title: ( localize(3089, 'Detect system color mode disabled. Click to configure.')),
+                title: ( localize(2612, 'Detect system color mode disabled. Click to configure.')),
                 icon: Codicon.colorMode,
                 isChecked: false,
                 ...defaultToggleStyles
             })));
         }
         const options = {
-            installMessage: ( localize(3090, "Install Additional Color Themes...")),
-            browseMessage: '$(plus) ' + ( localize(3091, "Browse Additional Color Themes...")),
+            installMessage: ( localize(2613, "Install Additional Color Themes...")),
+            browseMessage: '$(plus) ' + ( localize(2614, "Browse Additional Color Themes...")),
             placeholderMessage: this.getTitle(preferredColorScheme),
             marketplaceTag: 'category:themes',
             toggles: [modeConfigureToggle],
@@ -460,9 +459,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(3092, "light themes")));
-        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(3093, "dark themes")));
-        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(3094, "high contrast themes")));
+        const lightEntries = toEntries(themes.filter(t => t.type === ColorScheme.LIGHT), ( localize(2615, "light themes")));
+        const darkEntries = toEntries(themes.filter(t => t.type === ColorScheme.DARK), ( localize(2616, "dark themes")));
+        const hcEntries = toEntries(themes.filter(t => isHighContrast(t.type)), ( localize(2617, "high contrast themes")));
         let picks;
         switch (preferredColorScheme) {
             case ColorScheme.DARK:
@@ -485,7 +484,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectFileIconThemeCommandId,
-            title: ( localize2(3095, 'File Icon Theme')),
+            title: ( localize2(2618, 'File Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -493,8 +492,8 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(3096, "Install Additional File Icon Themes...")),
-            placeholderMessage: ( localize(3097, "Select File Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(2619, "Install Additional File Icon Themes...")),
+            placeholderMessage: ( localize(2620, "Select File Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setFileIconTheme(theme, settingsTarget);
@@ -502,8 +501,8 @@ registerAction2(class extends Action2 {
         const instantiationService = accessor.get(IInstantiationService);
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [
-            { type: 'separator', label: ( localize(3098, 'file icon themes')) },
-            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(3099, 'None')), description: ( localize(3100, 'Disable File Icons')) },
+            { type: 'separator', label: ( localize(2621, 'file icon themes')) },
+            { id: '', theme: FileIconThemeData.noIconTheme, label: ( localize(2622, 'None')), description: ( localize(2623, 'Disable File Icons')) },
             ...toEntries(await themeService.getFileIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getFileIconTheme());
@@ -514,7 +513,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectProductIconThemeCommandId,
-            title: ( localize2(3101, 'Product Icon Theme')),
+            title: ( localize2(2624, 'Product Icon Theme')),
             category: Categories.Preferences,
             f1: true
         });
@@ -522,9 +521,9 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const themeService = accessor.get(IWorkbenchThemeService);
         const options = {
-            installMessage: ( localize(3102, "Install Additional Product Icon Themes...")),
-            browseMessage: '$(plus) ' + ( localize(3103, "Browse Additional Product Icon Themes...")),
-            placeholderMessage: ( localize(3104, "Select Product Icon Theme (Up/Down Keys to Preview)")),
+            installMessage: ( localize(2625, "Install Additional Product Icon Themes...")),
+            browseMessage: '$(plus) ' + ( localize(2626, "Browse Additional Product Icon Themes...")),
+            placeholderMessage: ( localize(2627, "Select Product Icon Theme (Up/Down Keys to Preview)")),
             marketplaceTag: 'tag:product-icon-theme'
         };
         const setTheme = (theme, settingsTarget) => themeService.setProductIconTheme(theme, settingsTarget);
@@ -532,8 +531,8 @@ registerAction2(class extends Action2 {
         const instantiationService = accessor.get(IInstantiationService);
         const picker = instantiationService.createInstance(InstalledThemesPicker, options, setTheme, getMarketplaceColorThemes);
         const picks = [
-            { type: 'separator', label: ( localize(3105, 'product icon themes')) },
-            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(3106, 'Default')) },
+            { type: 'separator', label: ( localize(2628, 'product icon themes')) },
+            { id: DEFAULT_PRODUCT_ICON_THEME_ID, theme: ProductIconThemeData.defaultTheme, label: ( localize(2629, 'Default')) },
             ...toEntries(await themeService.getProductIconThemes()),
         ];
         await picker.openQuickPick(picks, themeService.getProductIconTheme());
@@ -599,13 +598,13 @@ function toEntries(themes, label) {
 }
 const configureButton = {
     iconClass: ThemeIcon.asClassName(manageExtensionIcon),
-    tooltip: ( localize(3107, "Manage Extension")),
+    tooltip: ( localize(2630, "Manage Extension")),
 };
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.generateColorTheme',
-            title: ( localize2(3108, 'Generate Color Theme From Current Settings')),
+            title: ( localize2(2631, 'Generate Color Theme From Current Settings')),
             category: Categories.Developer,
             f1: true
         });
@@ -655,7 +654,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: toggleLightDarkThemesCommandId,
-            title: ( localize2(3109, 'Toggle between Light/Dark Themes')),
+            title: ( localize2(2632, 'Toggle between Light/Dark Themes')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -667,13 +666,13 @@ registerAction2(class extends Action2 {
         const preferencesService = accessor.get(IPreferencesService);
         if (configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
             const message = ( localize(
-                3110,
+                2633,
                 "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(3111, "Open Settings")),
+                    label: ( localize(2634, "Open Settings")),
                     run: () => {
                         return preferencesService.openUserSettings({ query: ThemeSettings.DETECT_COLOR_SCHEME });
                     }
@@ -711,7 +710,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: browseColorThemesInMarketplaceCommandId,
-            title: ( localize2(3112, 'Browse Color Themes in Marketplace')),
+            title: ( localize2(2635, 'Browse Color Themes in Marketplace')),
             category: Categories.Preferences,
             f1: true,
         });
@@ -747,13 +746,13 @@ registerAction2(class extends Action2 {
 });
 const ThemesSubMenu = ( (new MenuId('ThemesSubMenu')));
 MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
-    title: ( localize(3113, "Themes")),
+    title: ( localize(2636, "Themes")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-    title: ( localize(3114, "&&Theme")),
+    title: ( localize(2637, "&&Theme")),
     submenu: ThemesSubMenu,
     group: '2_configuration',
     order: 7
@@ -761,21 +760,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectColorThemeCommandId,
-        title: ( localize(3082, 'Color Theme'))
+        title: ( localize(2605, 'Color Theme'))
     },
     order: 1
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectFileIconThemeCommandId,
-        title: ( localize(3115, "File Icon Theme"))
+        title: ( localize(2638, "File Icon Theme"))
     },
     order: 2
 });
 MenuRegistry.appendMenuItem(ThemesSubMenu, {
     command: {
         id: SelectProductIconThemeCommandId,
-        title: ( localize(3116, "Product Icon Theme"))
+        title: ( localize(2639, "Product Icon Theme"))
     },
     order: 3
 });
@@ -817,20 +816,20 @@ let DefaultThemeUpdatedNotificationContribution = class DefaultThemeUpdatedNotif
         if (newTheme) {
             const choices = [
                 {
-                    label: ( localize(3117, "Keep New Theme")),
+                    label: ( localize(2640, "Keep New Theme")),
                     run: () => {
                         this._writeTelemetry('keepNew');
                     }
                 },
                 {
-                    label: ( localize(3118, "Browse Themes")),
+                    label: ( localize(2641, "Browse Themes")),
                     run: () => {
                         this._writeTelemetry('browse');
                         this._commandService.executeCommand(SelectColorThemeCommandId);
                     }
                 },
                 {
-                    label: ( localize(3119, "Revert")),
+                    label: ( localize(2642, "Revert")),
                     run: async () => {
                         this._writeTelemetry('keepOld');
                         const oldSettingsId = usingLight ? ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD : ThemeSettingDefaults.COLOR_THEME_DARK_OLD;
@@ -842,7 +841,7 @@ let DefaultThemeUpdatedNotificationContribution = class DefaultThemeUpdatedNotif
                 }
             ];
             await this._notificationService.prompt(Severity$1.Info, ( localize(
-                3120,
+                2643,
                 "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, {
@@ -855,20 +854,20 @@ let DefaultThemeUpdatedNotificationContribution = class DefaultThemeUpdatedNotif
         const theme = (await this._workbenchThemeService.getColorThemes()).find(theme => theme.settingsId === newThemeSettingsId);
         if (theme) {
             const choices = [{
-                    label: ( localize(3121, "Try New Theme")),
+                    label: ( localize(2644, "Try New Theme")),
                     run: () => {
                         this._writeTelemetry('tryNew');
                         this._workbenchThemeService.setColorTheme(theme, 'auto');
                     }
                 },
                 {
-                    label: ( localize(3122, "Cancel")),
+                    label: ( localize(2645, "Cancel")),
                     run: () => {
                         this._writeTelemetry('cancel');
                     }
                 }];
             await this._notificationService.prompt(Severity$1.Info, ( localize(
-                3123,
+                2646,
                 "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') });

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

@@ -139,13 +139,13 @@ class FileIconThemeLoader {
             const contentValue = parse(content, errors);
             if (errors.length > 0) {
                 return Promise.reject(( (new Error(( localize(
-                    7205,
+                    7212,
                     "Problems parsing file icons file: {0}",
                     ( (errors.map(e => getParseErrorMessage(e.error)))).join(', ')
                 ))))));
             }
             else if (getNodeType(contentValue) !== 'object') {
-                return Promise.reject(( (new Error(( localize(7206, "Invalid format for file icons theme file: Object expected."))))));
+                return Promise.reject(( (new Error(( localize(7213, "Invalid format for file icons theme file: Object expected."))))));
             }
             return Promise.resolve(contentValue);
         });
@@ -363,7 +363,7 @@ function handleParentFolder(key, selectors) {
     return key;
 }
 function escapeCSS(str) {
-    str = str.replace(/[\x11\x12\x14\x15\x40]/g, '/');
+    str = str.replace(/[\s]/g, '/');
     return mainWindow.CSS.escape(str);
 }