Fixes #4069 ensures exact match on found autolinks

Author: eamodio

CHANGELOG.md

@@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Fixes _Show \* View_ commands fail intermittently ([#4127](https://github.com/gitkraken/vscode-gitlens/issues/4127))
 - Fixes load more not working on incoming changes in Commits/Repositories views ([#4154](https://github.com/gitkraken/vscode-gitlens/issues/4154))
 - Fixes incorrect settings.json entry for Google Gemini 2.0 Flash Thinking causes linter warning ([#4168](https://github.com/gitkraken/vscode-gitlens/issues/4168))
+- Fixes multiple autolinks in commit message are broken when enriched ([#4069](https://github.com/gitkraken/vscode-gitlens/issues/4069))
 
 ## [16.3.3] - 2025-03-13
 

src/autolinks/autolinksProvider.ts

@@ -301,7 +301,7 @@ export class AutolinksProvider implements Disposable {
 				}
 			}
 
-			if (remotes != null && remotes.length !== 0) {
+			if (remotes?.length) {
 				remotes = [...remotes].sort((a, b) => {
 					const aConnected = a.maybeIntegrationConnected;
 					const bConnected = b.maybeIntegrationConnected;

src/autolinks/models/autolinks.ts

@@ -23,21 +23,10 @@ export interface AutolinkReference {
 	readonly descriptor?: ResourceDescriptor;
 }
 
-export interface Autolink extends AutolinkReference {
+export interface Autolink extends Omit<CacheableAutolinkReference, 'id'> {
 	provider?: ProviderReference;
 	id: string;
 	index?: number;
-
-	tokenize?:
-		| ((
-				text: string,
-				outputFormat: 'html' | 'markdown' | 'plaintext',
-				tokenMapping: Map<string, string>,
-				enrichedAutolinks?: Map<string, MaybeEnrichedAutolink>,
-				prs?: Set<string>,
-				footnotes?: Map<number, string>,
-		  ) => string)
-		| null;
 }
 
 export type EnrichedAutolink = [
@@ -51,6 +40,8 @@ export type MaybeEnrichedAutolink = readonly [
 ];
 
 export interface CacheableAutolinkReference extends AutolinkReference {
+	id?: never;
+
 	tokenize?:
 		| ((
 				text: string,

src/autolinks/utils/-webview/autolinks.utils.ts

@@ -61,49 +61,51 @@ function compareAutolinks(a: Autolink, b: Autolink): number {
 }
 
 export function ensureCachedRegex(
-	ref: CacheableAutolinkReference,
+	ref: Autolink | CacheableAutolinkReference,
 	outputFormat: 'html',
 ): asserts ref is RequireSome<CacheableAutolinkReference, 'messageHtmlRegex'>;
 export function ensureCachedRegex(
-	ref: CacheableAutolinkReference,
+	ref: Autolink | CacheableAutolinkReference,
 	outputFormat: 'markdown',
 ): asserts ref is RequireSome<CacheableAutolinkReference, 'messageMarkdownRegex'>;
 export function ensureCachedRegex(
-	ref: CacheableAutolinkReference,
+	ref: Autolink | CacheableAutolinkReference,
 	outputFormat: 'plaintext',
-): asserts ref is RequireSome<CacheableAutolinkReference, 'messageRegex' | 'branchNameRegex'>;
+): asserts ref is RequireSome<CacheableAutolinkReference, 'messageRegex'>;
 export function ensureCachedRegex(
-	ref: CacheableAutolinkReference,
+	ref: Autolink | CacheableAutolinkReference,
 	outputFormat: 'html' | 'markdown' | 'plaintext',
-): boolean {
+): void {
+	// If the ref is a matched Autolink then only match the exact `id`
+	const refPattern = ref.id ? ref.id : ref.alphanumeric ? '\\w+' : '\\d+';
+	const refFlags = !ref.id && ref.ignoreCase ? 'gi' : 'g';
+
 	// Regexes matches the ref prefix followed by a token (e.g. #1234)
-	if (outputFormat === 'markdown' && ref.messageMarkdownRegex == null) {
+	if (outputFormat === 'markdown') {
 		// Extra `\\\\` in `\\\\\\[` is because the markdown is escaped
-		ref.messageMarkdownRegex = new RegExp(
-			`(^|\\s|\\(|\\[|\\{)(${escapeRegex(encodeHtmlWeak(escapeMarkdown(ref.prefix)))}(${
-				ref.alphanumeric ? '\\w' : '\\d'
-			}+))\\b`,
-			ref.ignoreCase ? 'gi' : 'g',
-		);
-	} else if (outputFormat === 'html' && ref.messageHtmlRegex == null) {
-		ref.messageHtmlRegex = new RegExp(
-			`(^|\\s|\\(|\\[|\\{)(${escapeRegex(encodeHtmlWeak(ref.prefix))}(${ref.alphanumeric ? '\\w' : '\\d'}+))\\b`,
-			ref.ignoreCase ? 'gi' : 'g',
+		ref.messageMarkdownRegex ??= new RegExp(
+			`(^|\\s|\\(|\\[|\\{)(${escapeRegex(encodeHtmlWeak(escapeMarkdown(ref.prefix)))}(${refPattern}))\\b`,
+			refFlags,
 		);
-	} else if (ref.messageRegex == null) {
-		ref.messageRegex = new RegExp(
-			`(^|\\s|\\(|\\[|\\{)(${escapeRegex(ref.prefix)}(${ref.alphanumeric ? '\\w' : '\\d'}+))\\b`,
-			ref.ignoreCase ? 'gi' : 'g',
-		);
-		ref.branchNameRegex = new RegExp(
-			`(^|\\-|_|\\.|\\/)(?<prefix>${ref.prefix})(?<issueKeyNumber>${
-				ref.alphanumeric ? '\\w' : '\\d'
-			}+)(?=$|\\-|_|\\.|\\/)`,
-			'gi',
+	} else if (outputFormat === 'html') {
+		ref.messageHtmlRegex ??= new RegExp(
+			`(^|\\s|\\(|\\[|\\{)(${escapeRegex(encodeHtmlWeak(ref.prefix))}(${refPattern}))\\b`,
+			refFlags,
 		);
+	} else {
+		ref.messageRegex ??= new RegExp(`(^|\\s|\\(|\\[|\\{)(${escapeRegex(ref.prefix)}(${refPattern}))\\b`, refFlags);
 	}
+}
 
-	return true;
+export function ensureCachedBranchNameRegex(
+	ref: CacheableAutolinkReference,
+): asserts ref is RequireSome<CacheableAutolinkReference, 'branchNameRegex'> {
+	ref.branchNameRegex ??= new RegExp(
+		`(^|\\-|_|\\.|\\/)(?<prefix>${ref.prefix})(?<issueKeyNumber>${
+			ref.alphanumeric ? '\\w' : '\\d'
+		}+)(?=$|\\-|_|\\.|\\/)`,
+		'gi',
+	);
 }
 
 export const numRegex = /<num>/g;
@@ -165,7 +167,7 @@ export function getBranchAutolinks(branchName: string, refsets: Readonly<RefSet[
 				continue;
 			}
 
-			ensureCachedRegex(ref, 'plaintext');
+			ensureCachedBranchNameRegex(ref);
 			const matches = branchName.matchAll(ref.branchNameRegex);
 			do {
 				match = matches.next();