Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - render emojis when showing blame information (#236051)

Browse Source
This commit is contained in:
Ladislau Szomoru
2024-12-13 14:48:37 +01:00
committed by GitHub
parent af33df91a4
commit 380de2f146
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/git/src/blame.ts
View File

@@ -10,6 +10,7 @@ import { Repository } from './repository';
import { throttle } from './decorators';
import { BlameInformation } from './git';
import { fromGitUri, isGitUri } from './uri';
import { emojify, ensureEmojis } from './emoji';
function lineRangesContainLine(changes: readonly TextEditorChange[], lineNumber: number): boolean {
return changes.some(c => c.modified.startLineNumber <= lineNumber && lineNumber < c.modified.endLineNumberExclusive);
@@ -171,7 +172,7 @@ export class GitBlameController {
const templateTokens = {
hash: blameInformation.hash,
hashShort: blameInformation.hash.substring(0, 8),
subject: blameInformation.subject ?? '',
subject: emojify(blameInformation.subject ?? ''),
authorName: blameInformation.authorName ?? '',
authorEmail: blameInformation.authorEmail ?? '',
authorDate: new Date(blameInformation.authorDate ?? new Date()).toLocaleString(),
@@ -203,7 +204,7 @@ export class GitBlameController {
markdownString.appendMarkdown('\n\n');
}
markdownString.appendMarkdown(`${blameInformation.subject}\n\n`);
markdownString.appendMarkdown(`${emojify(blameInformation.subject ?? '')}\n\n`);
markdownString.appendMarkdown(`---\n\n`);
markdownString.appendMarkdown(`[$(eye) View Commit](command:git.blameStatusBarItem.viewCommit?${encodeURIComponent(JSON.stringify([documentUri, blameInformation.hash]))} "${l10n.t('View Commit')}")`);
@@ -259,6 +260,10 @@ export class GitBlameController {
return resourceBlameInformation;
}
// Ensure that the emojis are loaded. We will
// use them when formatting the blame information.
await ensureEmojis();
// Get blame information for the resource and cache it
const blameInformation = await repository.blame2(resource.fsPath, commit) ?? [];
this._repositoryBlameCache.setBlameInformation(repository, resource, commit, blameInformation);