Adding default fileicon support to language contributions. Fixes #14662

microsoft · Mar 12, 2021 · 4e4246a · 4e4246a
1 parent 809e111
commit 4e4246a
Show file tree

Hide file tree

Showing 7 changed files with 256 additions and 157 deletions.
diff --git a/src/vs/editor/common/services/languagesRegistry.ts b/src/vs/editor/common/services/languagesRegistry.ts
@@ -26,6 +26,7 @@ export interface IResolvedLanguage {
 	extensions: string[];
 	filenames: string[];
 	configurationFiles: URI[];
+	icons: string[];
 }
 
 export class LanguagesRegistry extends Disposable {
@@ -129,7 +130,8 @@ export class LanguagesRegistry extends Disposable {
 				aliases: [],
 				extensions: [],
 				filenames: [],
-				configurationFiles: []
+				configurationFiles: [],
+				icons: []
 			};
 			this._languages[langId] = resolvedLanguage;
 		}
@@ -227,6 +229,10 @@ export class LanguagesRegistry extends Disposable {
 		if (lang.configuration) {
 			resolvedLanguage.configurationFiles.push(lang.configuration);
 		}
+
+		if (lang.icon) {
+			resolvedLanguage.icons.push(lang.icon);
+		}
 	}
 
 	public isRegisteredMode(mimetypeOrModeId: string): boolean {
@@ -275,6 +281,14 @@ export class LanguagesRegistry extends Disposable {
 		return (language.mimetypes[0] || null);
 	}
 
+	public getIconForMode(modeId: string): string | null {
+		if (!hasOwnProperty.call(this._languages, modeId)) {
+			return null;
+		}
+		const language = this._languages[modeId];
+		return (language.icons[0] || null);
+	}
+
 	public extractModeIds(commaSeparatedMimetypesOrCommaSeparatedIds: string | undefined): string[] {
 		if (!commaSeparatedMimetypesOrCommaSeparatedIds) {
 			return [];

diff --git a/src/vs/editor/common/services/modeService.ts b/src/vs/editor/common/services/modeService.ts
@@ -20,6 +20,7 @@ export interface ILanguageExtensionPoint {
 	aliases?: string[];
 	mimetypes?: string[];
 	configuration?: URI;
+	icon?: string;
 }
 
 export interface ILanguageSelection extends IDisposable {
@@ -40,6 +41,7 @@ export interface IModeService {
 	getExtensions(alias: string): string[];
 	getFilenames(alias: string): string[];
 	getMimeForMode(modeId: string): string | null;
+	getIconForMode(modeId: string): string | null;
 	getLanguageName(modeId: string): string | null;
 	getModeIdForLanguageName(alias: string): string | null;
 	getModeIdByFilepathOrFirstLine(resource: URI, firstLine?: string): string | null;

diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts
@@ -88,6 +88,10 @@ export class ModeServiceImpl extends Disposable implements IModeService {
 		return this._registry.getMimeForMode(modeId);
 	}
 
+	public getIconForMode(modeId: string): string | null {
+		return this._registry.getIconForMode(modeId);
+	}
+
 	public getLanguageName(modeId: string): string | null {
 		return this._registry.getLanguageName(modeId);
 	}

diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -6498,6 +6498,7 @@ declare namespace monaco.languages {
 		aliases?: string[];
 		mimetypes?: string[];
 		configuration?: Uri;
+		icon?: string;
 	}
 	/**
 	 * A Monarch language definition

diff --git a/src/vs/workbench/services/mode/common/workbenchModeService.ts b/src/vs/workbench/services/mode/common/workbenchModeService.ts
@@ -26,6 +26,7 @@ export interface IRawLanguageExtensionPoint {
 	aliases: string[];
 	mimetypes: string[];
 	configuration: string;
+	icon: string;
 }
 
 export const languagesExtPoint: IExtensionPoint<IRawLanguageExtensionPoint[]> = ExtensionsRegistry.registerExtensionPoint<IRawLanguageExtensionPoint[]>({
@@ -85,6 +86,10 @@ export const languagesExtPoint: IExtensionPoint<IRawLanguageExtensionPoint[]> =
 					description: nls.localize('vscode.extension.contributes.languages.configuration', 'A relative path to a file containing configuration options for the language.'),
 					type: 'string',
 					default: './language-configuration.json'
+				},
+				icon: {
+					description: nls.localize('vscode.extension.contributes.languages.icon', 'A contributed icon name to use as file icon, if no icon theme provides one for the language'),
+					type: 'string'
 				}
 			}
 		}
@@ -131,7 +136,8 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
 							firstLine: ext.firstLine,
 							aliases: ext.aliases,
 							mimetypes: ext.mimetypes,
-							configuration: configuration
+							configuration: configuration,
+							icon: ext.icon
 						});
 					}
 				}
@@ -229,6 +235,10 @@ function isValidLanguageExtensionPoint(value: IRawLanguageExtensionPoint, collec
 		collector.error(nls.localize('opt.mimetypes', "property `{0}` can be omitted and must be of type `string[]`", 'mimetypes'));
 		return false;
 	}
+	if (typeof value.icon !== 'undefined' && typeof value.icon !== 'string') {
+		collector.error(nls.localize('opt.icon', "property `{0}` can be omitted and must be of type `string`", 'icon'));
+		return false;
+	}
 	return true;
 }