[themes] When opening a new window, product icons don't load immediately (microsoft#155485)

[themes] When opening a new window, product icons don't load immediatel. Fixes microsoft#142236

Author: aeschli

src/vs/platform/theme/common/iconRegistry.ts

@@ -7,6 +7,7 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import { Codicon, CSSIcon } from 'vs/base/common/codicons';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
+import { isString } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
@@ -62,6 +63,28 @@ export interface IconFontDefinition {
 	readonly src: IconFontSource[];
 }
 
+export namespace IconFontDefinition {
+	export function toJSONObject(iconFont: IconFontDefinition): any {
+		return {
+			weight: iconFont.weight,
+			style: iconFont.style,
+			src: iconFont.src.map(s => ({ format: s.format, location: s.location.toString() }))
+		};
+	}
+	export function fromJSONObject(json: any): IconFontDefinition | undefined {
+		const stringOrUndef = (s: any) => isString(s) ? s : undefined;
+		if (json && Array.isArray(json.src) && json.src.every((s: any) => isString(s.format) && isString(s.location))) {
+			return {
+				weight: stringOrUndef(json.weight),
+				style: stringOrUndef(json.style),
+				src: json.src.map((s: any) => ({ format: s.format, location: URI.parse(s.location) }))
+			};
+		}
+		return undefined;
+	}
+}
+
+
 export interface IconFontSource {
 	readonly location: URI;
 	readonly format: string;

src/vs/workbench/services/themes/browser/productIconThemeData.ts

@@ -13,7 +13,7 @@ import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE } from 'vs/workbench/services/themes/common/themeConfiguration';
 import { fontIdRegex, fontWeightRegex, fontStyleRegex, fontFormatRegex } from 'vs/workbench/services/themes/common/productIconThemeSchema';
-import { isString } from 'vs/base/common/types';
+import { isObject, isString } from 'vs/base/common/types';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IconDefinition, getIconRegistry, IconContribution, IconFontDefinition, IconFontSource } from 'vs/platform/theme/common/iconRegistry';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
@@ -132,13 +132,40 @@ export class ProductIconThemeData implements IWorkbenchProductIconTheme {
 						break;
 				}
 			}
+			const { iconDefinitions, iconFontDefinitions } = data;
+			if (Array.isArray(iconDefinitions) && isObject(iconFontDefinitions)) {
+				const restoredIconDefinitions = new Map<string, IconDefinition>();
+				for (const entry of iconDefinitions) {
+					const { id, fontCharacter, fontId } = entry;
+					if (isString(id) && isString(fontCharacter)) {
+						if (isString(fontId)) {
+							const iconFontDefinition = IconFontDefinition.fromJSONObject(iconFontDefinitions[fontId]);
+							if (iconFontDefinition) {
+								restoredIconDefinitions.set(id, { fontCharacter, font: { id: fontId, definition: iconFontDefinition } });
+							}
+						} else {
+							restoredIconDefinitions.set(id, { fontCharacter });
+						}
+					}
+				}
+				theme.iconThemeDocument = { iconDefinitions: restoredIconDefinitions };
+			}
 			return theme;
 		} catch (e) {
 			return undefined;
 		}
 	}
 
 	toStorage(storageService: IStorageService) {
+		const iconDefinitions = [];
+		const iconFontDefinitions: { [id: string]: IconFontDefinition } = {};
+		for (const entry of this.iconThemeDocument.iconDefinitions.entries()) {
+			const font = entry[1].font;
+			iconDefinitions.push({ id: entry[0], fontCharacter: entry[1].fontCharacter, fontId: font?.id });
+			if (font && iconFontDefinitions[font.id] === undefined) {
+				iconFontDefinitions[font.id] = IconFontDefinition.toJSONObject(font.definition);
+			}
+		}
 		const data = JSON.stringify({
 			id: this.id,
 			label: this.label,
@@ -147,6 +174,8 @@ export class ProductIconThemeData implements IWorkbenchProductIconTheme {
 			styleSheetContent: this.styleSheetContent,
 			watch: this.watch,
 			extensionData: ExtensionData.toJSONObject(this.extensionData),
+			iconDefinitions,
+			iconFontDefinitions
 		});
 		storageService.store(ProductIconThemeData.STORAGE_KEY, data, StorageScope.PROFILE, StorageTarget.MACHINE);
 	}