use readonly in themeservice

aeschli · aeschli · commit 016d35fe2355 · 2017-01-17T12:56:28.000+01:00
diff --git a/src/vs/workbench/services/themes/common/themeService.ts b/src/vs/workbench/services/themes/common/themeService.ts
@@ -14,21 +14,21 @@ export const VS_LIGHT_THEME = 'vs';
 export const VS_DARK_THEME = 'vs-dark';
 export const VS_HC_THEME = 'hc-black';
 
-export class IColorTheme {
-	id: string;
-	label: string;
-	description?: string;
-	isLoaded: boolean;
-	settings?: IThemeSetting[];
+export interface IColorTheme {
+	readonly id: string;
+	readonly label: string;
+	readonly description?: string;
+	readonly isLoaded: boolean;
+	readonly settings?: IThemeSetting[];
 }
 
 export interface IFileIconTheme {
-	id: string;
-	label: string;
-	description?: string;
-	isLoaded: boolean;
-	hasFileIcons?: boolean;
-	hasFolderIcons?: boolean;
+	readonly id: string;
+	readonly label: string;
+	readonly description?: string;
+	readonly isLoaded: boolean;
+	readonly hasFileIcons?: boolean;
+	readonly hasFolderIcons?: boolean;
 }
 
 export interface IThemeService {
diff --git a/src/vs/workbench/services/themes/electron-browser/themeService.ts b/src/vs/workbench/services/themes/electron-browser/themeService.ts
@@ -101,13 +101,24 @@ let iconThemeExtPoint = ExtensionsRegistry.registerExtensionPoint<IThemeExtensio
 	}
 });
 
-interface IInternalColorThemeData extends IColorTheme {
+class IInternalColorThemeData implements IColorTheme {
+	id: string;
+	label: string;
+	description?: string;
+	settings?: IThemeSetting[];
+	isLoaded: boolean;
 	path?: string;
 	styleSheetContent?: string;
 	extensionData: ExtensionData;
 }
 
-interface IInternalIconThemeData extends IFileIconTheme {
+class IInternalIconThemeData implements IFileIconTheme {
+	id: string;
+	label: string;
+	description?: string;
+	hasFileIcons?: boolean;
+	hasFolderIcons?: boolean;
+	isLoaded: boolean;
 	path?: string;
 	styleSheetContent?: string;
 	extensionData: ExtensionData;
@@ -294,7 +305,6 @@ export class ThemeService implements IThemeService {
 				$(this.container).addClass(newThemeId);
 			}
 			this.currentColorTheme = newTheme;
-			newTheme.isLoaded = true;
 
 			this.storageService.store(COLOR_THEME_PREF, newThemeId, StorageScope.GLOBAL);
 			if (broadcastToAllWindows) {
@@ -462,7 +472,6 @@ export class ThemeService implements IThemeService {
 		let onApply = (newIconTheme: IInternalIconThemeData) => {
 			if (newIconTheme) {
 				this.currentIconTheme = newIconTheme;
-				newIconTheme.isLoaded = true;
 			} else {
 				this.currentIconTheme = noFileIconTheme;
 			}
@@ -510,6 +519,7 @@ function _applyIconTheme(data: IInternalIconThemeData, onApply: (theme: IInterna
 		data.styleSheetContent = result.content;
 		data.hasFileIcons = result.hasFileIcons;
 		data.hasFolderIcons = result.hasFolderIcons;
+		data.isLoaded = true;
 		_applyRules(data.styleSheetContent, iconThemeRulesClassName);
 		return onApply(data);
 	}, error => {
@@ -699,6 +709,7 @@ function applyTheme(theme: IInternalColorThemeData, onApply: (theme: IInternalCo
 		theme.settings = themeSettings;
 		let styleSheetContent = _processThemeObject(theme.id, themeSettings);
 		theme.styleSheetContent = styleSheetContent;
+		theme.isLoaded = true;
 		_applyRules(styleSheetContent, colorThemeRulesClassName);
 		return onApply(theme);
 	}, error => {
