bulk: use iconPath so that conversion is implict

jrieken · jrieken · commit d5bc0dfe8809 · 2020-01-20T16:00:48.000+01:00
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
@@ -1265,7 +1265,7 @@ export interface WorkspaceEditMetadata {
 	needsConfirmation: boolean;
 	label: string;
 	description?: string;
-	icon?: { id: string } | { light: URI, dark: URI };
+	iconPath?: { id: string } | { light: URI, dark: URI };
 }
 
 export interface WorkspaceFileEditOptions {
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -5901,7 +5901,7 @@ declare namespace monaco.languages {
 		needsConfirmation: boolean;
 		label: string;
 		description?: string;
-		icon?: {
+		iconPath?: {
 			id: string;
 		} | {
 			light: Uri;
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts
@@ -253,16 +253,16 @@ export class CategoryElementRenderer implements ITreeRenderer<BulkCategory, Fuzz
 		template.icon.style.setProperty('--background-light', null);
 
 		const { metadata } = node.element;
-		if (ThemeIcon.isThemeIcon(metadata.icon)) {
+		if (ThemeIcon.isThemeIcon(metadata.iconPath)) {
 			// css
-			const className = ThemeIcon.asClassName(metadata.icon);
+			const className = ThemeIcon.asClassName(metadata.iconPath);
 			template.icon.className = className ? `theme-icon ${className}` : '';
 
-		} else if (metadata.icon) {
+		} else if (metadata.iconPath) {
 			// background-image
 			template.icon.className = 'uri-icon';
-			template.icon.style.setProperty('--background-dark', `url("${metadata.icon.dark.toString(true)}")`);
-			template.icon.style.setProperty('--background-light', `url("${metadata.icon.light.toString(true)}")`);
+			template.icon.style.setProperty('--background-dark', `url("${metadata.iconPath.dark.toString(true)}")`);
+			template.icon.style.setProperty('--background-light', `url("${metadata.iconPath.light.toString(true)}")`);
 		}
 
 		template.label.setLabel(metadata.label, metadata.description, {

Original file line number	Diff line number	Diff line change
`@@ -1265,7 +1265,7 @@ export interface WorkspaceEditMetadata {`
`1265`	`1265`	`needsConfirmation: boolean;`
`1266`	`1266`	`label: string;`
`1267`	`1267`	`description?: string;`
`1268`		`- icon?: { id: string } \| { light: URI, dark: URI };`
	`1268`	`+ iconPath?: { id: string } \| { light: URI, dark: URI };`
`1269`	`1269`	`}`
`1270`	`1270`
`1271`	`1271`	`export interface WorkspaceFileEditOptions {`