Support file icons in explorer

aeschli · aeschli · commit 92e6f89507bd · 2016-08-18T22:24:24.000+02:00
diff --git a/src/vs/workbench/parts/files/browser/files.contribution.ts b/src/vs/workbench/parts/files/browser/files.contribution.ts
@@ -256,6 +256,11 @@ configurationRegistry.registerConfiguration({
 			'type': 'boolean',
 			'description': nls.localize('enableDragAndDrop', "Controls if the explorer should allow to move files and folders via drag and drop."),
 			'default': true
+		},
+		'explorer.fileIcons': {
+			'type': 'boolean',
+			'description': nls.localize('fileIcons', "Controls if the explorer shows icons for files and folders. The actual icon set is controled with the 'files.iconSet' setting."),
+			'default': false
 		}
 	}
 });
diff --git a/src/vs/workbench/parts/files/browser/views/explorerView.ts b/src/vs/workbench/parts/files/browser/views/explorerView.ts
@@ -199,6 +199,9 @@ export class ExplorerView extends CollapsibleViewletView {
 	private onConfigurationUpdated(configuration: IFilesConfiguration, refresh?: boolean): void {
 		this.autoReveal = configuration && configuration.explorer && configuration.explorer.autoReveal;
 
+		let showFileIcons = configuration && configuration.explorer && configuration.explorer.fileIcons;
+		DOM.toggleClass(this.treeContainer, 'show-file-icons', showFileIcons);
+
 		// Push down config updates to components of viewer
 		let needsRefresh = false;
 		if (this.filter) {
diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
@@ -341,7 +341,7 @@ export class FileRenderer extends ActionsRenderer implements IRenderer {
 			return 'folder-icon';
 		}
 
-		return 'text-file-icon';
+		return 'file-icon';
 	}
 }
 
diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts
@@ -68,6 +68,7 @@ export interface IFilesConfiguration extends IFilesConfiguration, IWorkbenchEdit
 		};
 		autoReveal: boolean;
 		enableDragAndDrop: boolean;
+		fileIcons: boolean;
 	};
 	editor: IEditorOptions;
 }

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,11 @@ configurationRegistry.registerConfiguration({`
`256`	`256`	`'type': 'boolean',`
`257`	`257`	`'description': nls.localize('enableDragAndDrop', "Controls if the explorer should allow to move files and folders via drag and drop."),`
`258`	`258`	`'default': true`
	`259`	`+ },`
	`260`	`+ 'explorer.fileIcons': {`
	`261`	`+ 'type': 'boolean',`
	`262`	`+ 'description': nls.localize('fileIcons', "Controls if the explorer shows icons for files and folders. The actual icon set is controled with the 'files.iconSet' setting."),`
	`263`	`+ 'default': false`
`259`	`264`	`}`
`260`	`265`	`}`
`261`	`266`	`});`
Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ export class FileRenderer extends ActionsRenderer implements IRenderer {`
`341`	`341`	`return 'folder-icon';`
`342`	`342`	`}`
`343`	`343`
`344`		`- return 'text-file-icon';`
	`344`	`+ return 'file-icon';`
`345`	`345`	`}`
`346`	`346`	`}`
`347`	`347`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ export interface IFilesConfiguration extends IFilesConfiguration, IWorkbenchEdit`
`68`	`68`	`};`
`69`	`69`	`autoReveal: boolean;`
`70`	`70`	`enableDragAndDrop: boolean;`
	`71`	`+ fileIcons: boolean;`
`71`	`72`	`};`
`72`	`73`	`editor: IEditorOptions;`
`73`	`74`	`}`