Closes #91695 - adds emoji support

extensions/git/src/emoji.ts

@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+import { workspace, Uri } from 'vscode';
+import { getExtensionContext } from './main';
+import { TextDecoder } from 'util';
+
+const emojiRegex = /:([-+_a-z0-9]+):/g;
+
+let emojiMap: Record<string, string> | undefined;
+let emojiMapPromise: Promise<void> | undefined;
+
+export async function ensureEmojis() {
+	if (emojiMap === undefined) {
+		if (emojiMapPromise === undefined) {
+			emojiMapPromise = loadEmojiMap();
+		}
+		await emojiMapPromise;
+	}
+}
+
+async function loadEmojiMap() {
+	const context = getExtensionContext();
+	const uri = (Uri as any).joinPath(context.extensionUri, 'resources', 'emojis.json');
+	emojiMap = JSON.parse(new TextDecoder('utf8').decode(await workspace.fs.readFile(uri)));
+}
+
+export function emojify(message: string) {
+	if (emojiMap === undefined) {
+		return message;
+	}
+
+	return message.replace(emojiRegex, (s, code) => {
+		return emojiMap?.[code] || s;
+	});
+}

extensions/git/src/main.ts

@@ -169,7 +169,14 @@ export async function _activate(context: ExtensionContext): Promise<GitExtension
 	}
 }
 
+let _context: ExtensionContext;
+export function getExtensionContext(): ExtensionContext {
+	return _context;
+}
+
 export async function activate(context: ExtensionContext): Promise<GitExtension> {
+	_context = context;
+
 	const result = await _activate(context);
 	context.subscriptions.push(registerAPICommands(result));
 	return result;

extensions/git/src/timelineProvider.ts

@@ -8,6 +8,7 @@ import { CancellationToken, ConfigurationChangeEvent, Disposable, env, Event, Ev
 import { Model } from './model';
 import { Repository, Resource } from './repository';
 import { debounce } from './decorators';
+import { emojify, ensureEmojis } from './emoji';
 
 const localize = nls.loadMessageBundle();
 
@@ -132,6 +133,8 @@ export class GitTimelineProvider implements TimelineProvider {
 			limit = options.limit === undefined ? undefined : options.limit + 1;
 		}
 
+		await ensureEmojis();
+
 		const commits = await repo.logFile(uri, {
 			maxEntries: limit,
 			hash: options.cursor,
@@ -155,12 +158,14 @@ export class GitTimelineProvider implements TimelineProvider {
 		const items = commits.map<GitTimelineItem>((c, i) => {
 			const date = dateType === 'authored' ? c.authorDate : c.commitDate;
 
-			const item = new GitTimelineItem(c.hash, commits[i + 1]?.hash ?? `${c.hash}^`, c.message, date?.getTime() ?? 0, c.hash, 'git:file:commit');
+			const message = emojify(c.message);
+
+			const item = new GitTimelineItem(c.hash, commits[i + 1]?.hash ?? `${c.hash}^`, message, date?.getTime() ?? 0, c.hash, 'git:file:commit');
 			item.iconPath = new (ThemeIcon as any)('git-commit');
 			if (showAuthor) {
 				item.description = c.authorName;
 			}
-			item.detail = `${c.authorName} (${c.authorEmail}) — ${c.hash.substr(0, 8)}\n${dateFormatter.format(date)}\n\n${c.message}`;
+			item.detail = `${c.authorName} (${c.authorEmail}) — ${c.hash.substr(0, 8)}\n${dateFormatter.format(date)}\n\n${message}`;
 			item.command = {
 				title: 'Open Comparison',
 				command: 'git.timeline.openDiff',