From 6d786dba0e5ae05ff3bdbe4bb44a3bcbe672f359 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 31 Aug 2016 12:58:22 +0200
Subject: [PATCH] [icon themes] prefer file extensions over language
 association

---
 .../services/themes/electron-browser/themeService.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/services/themes/electron-browser/themeService.ts b/src/vs/workbench/services/themes/electron-browser/themeService.ts
index b6cc8fc749f0..9f0e65d45f23 100644
--- a/src/vs/workbench/services/themes/electron-browser/themeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/themeService.ts
@@ -497,6 +497,12 @@ function _processIconThemeDocument(id: string, iconThemeDocumentPath: string, ic
 					addSelector(`${qualifier} .expanded .${escapeCSS(folderName.toLowerCase())}-name-folder-icon.folder-icon::before`, folderNamesExpanded[folderName]);
 				}
 			}
+			let languageIds = associations.languageIds;
+			if (languageIds) {
+				for (let languageId in languageIds) {
+					addSelector(`${qualifier} .${escapeCSS(languageId)}-lang-file-icon.file-icon::before`, languageIds[languageId]);
+				}
+			}
 			let fileExtensions = associations.fileExtensions;
 			if (fileExtensions) {
 				for (let fileExtension in fileExtensions) {
@@ -518,12 +524,6 @@ function _processIconThemeDocument(id: string, iconThemeDocumentPath: string, ic
 					addSelector(`${qualifier} ${selectors.join('')}.file-icon::before`, fileNames[fileName]);
 				}
 			}
-			let languageIds = associations.languageIds;
-			if (languageIds) {
-				for (let languageId in languageIds) {
-					addSelector(`${qualifier} .${escapeCSS(languageId)}-lang-file-icon.file-icon::before`, languageIds[languageId]);
-				}
-			}
 		}
 	}
 	collectSelectors(iconThemeDocument);