deco - never ending settings tweaks

jrieken · jrieken · commit 29cccbb9cbb6 · 2017-10-12T18:28:30.000+02:00
diff --git a/src/vs/workbench/browser/labels.ts b/src/vs/workbench/browser/labels.ts
@@ -34,7 +34,7 @@ export interface IResourceLabel {
 
 export interface IResourceLabelOptions extends IIconLabelOptions {
 	fileKind?: FileKind;
-	fileDecorations?: { useColors: boolean, useBadges: boolean };
+	fileDecorations?: { colors: boolean, badges: boolean };
 }
 
 export class ResourceLabel extends IconLabel {
@@ -187,13 +187,15 @@ export class ResourceLabel extends IconLabel {
 				resource,
 				this.options.fileKind !== FileKind.FILE
 			);
-			if (deco) {
+			if (deco && this.options.fileDecorations.colors) {
 				iconLabelOptions.extraClasses.push(deco.labelClasses);
-				iconLabelOptions.badge = deco.letter ? {
+			}
+			if (deco && deco.letter && this.options.fileDecorations.badges) {
+				iconLabelOptions.badge = {
 					letter: deco.letter,
 					title: deco.tooltip,
 					className: deco.badgeClassName,
-				} : undefined;
+				};
 			}
 		}
 
diff --git a/src/vs/workbench/parts/files/browser/files.contribution.ts b/src/vs/workbench/parts/files/browser/files.contribution.ts
@@ -351,19 +351,14 @@ configurationRegistry.registerConfiguration({
 			],
 			'description': nls.localize({ key: 'sortOrder', comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'] }, "Controls sorting order of files and folders in the explorer. In addition to the default sorting, you can set the order to 'mixed' (files and folders sorted combined), 'type' (by file type), 'modified' (by last modified date) or 'filesFirst' (sort files before folders).")
 		},
-		'explorer.fileDecorations.enabled': {
+		'explorer.decorations.colors': {
 			type: 'boolean',
-			description: nls.localize('explorer.fileDecorations.enabled', "Controls if the explorer should show file decorations, like SCM status or problems."),
+			description: nls.localize('explorer.decorations.colors', "Controls if file decorations should use colors."),
 			default: true
 		},
-		'explorer.fileDecorations.useColors': {
+		'explorer.decorations.badges': {
 			type: 'boolean',
-			description: nls.localize('explorer.fileDecorations.useColors', "Controls if file decorations should use colors."),
-			default: true
-		},
-		'explorer.fileDecorations.useBadges': {
-			type: 'boolean',
-			description: nls.localize('explorer.fileDecorations.useBadges', "Controls if file decorations should use badges."),
+			description: nls.localize('explorer.decorations.badges', "Controls if file decorations should use badges."),
 			default: true
 		},
 	}
diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
@@ -323,7 +323,7 @@ export class FileRenderer implements IRenderer {
 				title: stat.nonexistentRoot ? nls.localize('canNotResolve', "Can not resolve folder {0}", stat.resource.toString()) : undefined,
 				fileKind: stat.isRoot ? FileKind.ROOT_FOLDER : stat.isDirectory ? FileKind.FOLDER : FileKind.FILE,
 				extraClasses,
-				fileDecorations: this.configurationService.getConfiguration<IFilesConfiguration>().explorer.fileDecorations.enabled ? this.configurationService.getConfiguration<IFilesConfiguration>().explorer.fileDecorations : undefined
+				fileDecorations: this.configurationService.getConfiguration<IFilesConfiguration>().explorer.decorations
 			});
 		}
 
diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts
@@ -71,10 +71,9 @@ export interface IFilesConfiguration extends IFilesConfiguration, IWorkbenchEdit
 		enableDragAndDrop: boolean;
 		confirmDelete: boolean;
 		sortOrder: SortOrder;
-		fileDecorations: {
-			enabled: boolean;
-			useColors: boolean;
-			useBadges: boolean;
+		decorations: {
+			colors: boolean;
+			badges: boolean;
 		};
 	};
 	editor: IEditorOptions;

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ export class FileRenderer implements IRenderer {`
`323`	`323`	`title: stat.nonexistentRoot ? nls.localize('canNotResolve', "Can not resolve folder {0}", stat.resource.toString()) : undefined,`
`324`	`324`	`fileKind: stat.isRoot ? FileKind.ROOT_FOLDER : stat.isDirectory ? FileKind.FOLDER : FileKind.FILE,`
`325`	`325`	`extraClasses,`
`326`		`- fileDecorations: this.configurationService.getConfiguration<IFilesConfiguration>().explorer.fileDecorations.enabled ? this.configurationService.getConfiguration<IFilesConfiguration>().explorer.fileDecorations : undefined`
	`326`	`+ fileDecorations: this.configurationService.getConfiguration<IFilesConfiguration>().explorer.decorations`
`327`	`327`	`});`
`328`	`328`	`}`
`329`	`329`