Fixes #3246 preserves links in commit messages

Author: eamodio

CHANGELOG.md

@@ -17,7 +17,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Fixed
 
-- Fixes Incorrect PR Link Across Azure DevOps Projects ([#4207](https://github.com/gitkraken/vscode-gitlens/issues/4207))
+- Fixes incorrect PR Link Across Azure DevOps Projects ([#4207](https://github.com/gitkraken/vscode-gitlens/issues/4207))
+- Fixes detail view incorrectly parses GitHub account in commit message ([#3246](https://github.com/gitkraken/vscode-gitlens/issues/3246))
 
 ## [17.0.1] - 2025-04-03
 

src/git/formatters/commitFormatter.ts

@@ -734,7 +734,7 @@ export class CommitFormatter extends Formatter<GitCommit, CommitFormatOptions> {
 			message = encodeHtmlWeak(message);
 		}
 		if (outputFormat === 'markdown') {
-			message = escapeMarkdown(message, { quoted: true, inlineBackticks: true });
+			message = escapeMarkdown(message, { quoted: true, inlineBackticks: true, preserveLinks: true });
 		}
 
 		if (this._options.messageAutolinks) {

src/system/markdown.ts

@@ -1,5 +1,7 @@
-const escapeMarkdownRegex = /[\\*_{}[\]()#+\-.!]/g;
-const unescapeMarkdownRegex = /\\([\\`*_{}[\]()#+\-.!])/g;
+const escapeMarkdownRegex = /[\\*_{}[\]()#+\-.!<>]/g;
+const unescapeMarkdownRegex = /\\([\\`*_{}[\]()#+\-.!<>])/g;
+// Regex to find markdown links: [text](url) allowing for escaped brackets/parens within text/url
+const markdownLinkRegex = /(\[((?:\\.|[^[\]\\])+)\]\(((?:\\.|[^()\\])+)\))/g;
 
 const escapeMarkdownHeaderRegex = /^===/gm;
 const unescapeMarkdownHeaderRegex = /^\u200b===/gm;
@@ -8,19 +10,46 @@ const unescapeMarkdownHeaderRegex = /^\u200b===/gm;
 const markdownQuotedRegex = /\r?\n/g;
 const markdownBacktickRegex = /`/g;
 
-export function escapeMarkdown(s: string, options: { quoted?: boolean; inlineBackticks?: boolean } = {}): string {
-	s = s
-		// Escape markdown
-		.replace(escapeMarkdownRegex, '\\$&')
-		// Escape markdown header (since the above regex won't match it)
-		.replace(escapeMarkdownHeaderRegex, '\u200b===');
+export function escapeMarkdown(
+	s: string,
+	options?: { quoted?: boolean; inlineBackticks?: boolean; preserveLinks?: boolean },
+): string {
+	// If preserving links, replace them with placeholders first
+	if (options?.preserveLinks) {
+		const links = new Map<string, string>();
+		let linkIndex = 0;
 
-	if (options.inlineBackticks) {
+		s = s.replace(markdownLinkRegex, match => {
+			// Create a unique, unlikely-to-occur placeholder
+			const placeholder = `$$$GLLINK${linkIndex++}GLLINK$$$`;
+			links.set(placeholder, match);
+			return placeholder;
+		});
+
+		// Escape markdown characters
+		s = s.replace(escapeMarkdownRegex, '\\$&');
+
+		// Restore the original links if they were preserved
+		if (options?.preserveLinks && links.size) {
+			for (const [placeholder, originalLink] of links) {
+				s = s.replace(placeholder, originalLink);
+			}
+		}
+	} else {
+		// Escape markdown characters
+		s = s.replace(escapeMarkdownRegex, '\\$&');
+	}
+
+	// Escape markdown header (since the above regex won't match it)
+	s = s.replace(escapeMarkdownHeaderRegex, '\u200b===');
+
+	if (options?.inlineBackticks) {
 		s = escapeMarkdownCodeBlocks(s);
 	} else {
 		s = s.replace(markdownBacktickRegex, '\\$&');
 	}
-	if (!options.quoted) return s;
+
+	if (!options?.quoted) return s;
 
 	// Keep under the same block-quote but with line breaks
 	return s.trim().replace(markdownQuotedRegex, '\t\\\n>  ');