From 4284156bd4129fb2c1ead1b238ceb3242208a60a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 20 Sep 2016 18:32:17 +0200
Subject: [PATCH] icons: adopt file label for search

---
 src/vs/workbench/parts/search/browser/searchResultsView.ts | 7 ++++---
 src/vs/workbench/parts/search/browser/searchViewlet.ts     | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts
index a6c1c6facd6..6fbb8d8a912 100644
--- a/src/vs/workbench/parts/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts
@@ -14,7 +14,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, IActionRunner } from 'vs/base/common/actions';
 import { ActionsRenderer } from 'vs/base/parts/tree/browser/actionsRenderer';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { FileLabel } from 'vs/base/browser/ui/fileLabel/fileLabel';
+import { FileLabel } from 'vs/workbench/browser/labels';
 import { LeftRightWidget, IRenderer } from 'vs/base/browser/ui/leftRightWidget/leftRightWidget';
 import { ITree, IElementCallback, IDataSource, ISorter, IAccessibilityProvider, IFilter } from 'vs/base/parts/tree/browser/tree';
 import {ClickBehavior, DefaultController} from 'vs/base/parts/tree/browser/treeDefaults';
@@ -140,9 +140,10 @@ export class SearchRenderer extends ActionsRenderer {
 			let widget: LeftRightWidget;
 
 			leftRenderer = (left: HTMLElement): any => {
-				new FileLabel(left, fileMatch.resource(), this.contextService);
+				const label = this.instantiationService.createInstance(FileLabel, left);
+				label.setFile(fileMatch.resource());
 
-				return null;
+				return () => label.dispose();
 			};
 
 			rightRenderer = (right: HTMLElement) => {
diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts
index 9f251cce6af..08b1038cde1 100644
--- a/src/vs/workbench/parts/search/browser/searchViewlet.ts
+++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts
@@ -374,6 +374,7 @@ export class SearchViewlet extends Viewlet {
 	private createSearchResultsView(builder: Builder): void {
 		builder.div({ 'class': 'results' }, (div) => {
 			this.results = div;
+			this.results.addClass('show-file-icons');
 
 			let dataSource = new SearchDataSource();
 			let renderer = this.instantiationService.createInstance(SearchRenderer, this.getActionRunner(), this);