editor - properly resolve iconTheme editor option

Benjamin Pasero · Benjamin Pasero · commit 35553860922b · 2020-04-27T07:55:41.000+02:00
diff --git a/src/vs/workbench/browser/parts/editor/editor.ts b/src/vs/workbench/browser/parts/editor/editor.ts
@@ -52,9 +52,7 @@ export function getEditorPartOptions(config: IWorkbenchEditorConfiguration): IEd
 		return options;
 	}
 
-	if (typeof config.workbench.iconTheme === 'string') {
-		options.iconTheme = config.workbench.iconTheme;
-	}
+	options.iconTheme = config.workbench.iconTheme;
 
 	if (config.workbench.editor) {
 		Object.assign(options, config.workbench.editor);

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,7 @@ export function getEditorPartOptions(config: IWorkbenchEditorConfiguration): IEd`
`52`	`52`	`return options;`
`53`	`53`	`}`
`54`	`54`
`55`		`- if (typeof config.workbench.iconTheme === 'string') {`
`56`		`- options.iconTheme = config.workbench.iconTheme;`
`57`		`- }`
	`55`	`+ options.iconTheme = config.workbench.iconTheme;`
`58`	`56`
`59`	`57`	`if (config.workbench.editor) {`
`60`	`58`	`Object.assign(options, config.workbench.editor);`