Add extra segment for file-name priority

Make `folder/*.ext` selector lower priority than `file.ext`.
microsoft · Jan 4, 2022 · ff306e7 · ff306e7
1 parent 09374ea
commit ff306e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/vs/editor/common/services/getIconClasses.ts b/src/vs/editor/common/services/getIconClasses.ts
@@ -48,6 +48,7 @@ export function getIconClasses(modelService: IModelService, languageService: ILa
 			// Name & Extension(s)
 			if (name) {
 				classes.push(`${name}-name-file-icon`);
+				classes.push(`name-file-icon`); // extra segment to increase file-name score
 				// Avoid doing an explosive combination of extensions for very long filenames
 				// (most file systems do not allow files > 255 length) with lots of `.` characters
 				// https://github.com/microsoft/vscode/issues/116199

diff --git a/src/vs/workbench/services/themes/browser/fileIconThemeData.ts b/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
@@ -344,8 +344,9 @@ function _processIconThemeDocument(id: string, iconThemeDocumentLocation: URI, i
 						selectors.push(`.${escapeCSS(directoryName.toLowerCase())}-name-dir-icon`);
 						fileName = fileIconDirectoryRegexMatch[2];
 					}
-					fileName = fileName.toLowerCase();
+					fileName = fileName.toLowerCase(); // extra segment to increase file-name score
 					selectors.push(`.${escapeCSS(fileName)}-name-file-icon`);
+					selectors.push('.name-file-icon');
 					let segments = fileName.split('.');
 					if (segments.length) {
 						for (let i = 1; i < segments.length; i++) {