From b7fc6a56ada7a8890e4dd4b260da1ee5bfb9785a Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Mon, 16 Nov 2026 01:52:40 -0800 Subject: [PATCH] Require a letter after each email domain dot and keep text joins linear An address like _a_@b.-c.com is not a GFM bare email, so emitting it bare let the underscores become emphasis; it now uses the explicit mailto link. Joining split text no longer copies the previous node on every merge. Co-authored-by: LDH1103 --- src/main/jira/adf-inline-markdown.ts | 2 +- src/main/jira/adf-text-marks.ts | 6 +++++- src/main/jira/markdown-adf.test.ts | 7 ++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/jira/adf-inline-markdown.ts b/src/main/jira/adf-inline-markdown.ts index 4403433d836..eda7dd18c19 100644 --- a/src/main/jira/adf-inline-markdown.ts +++ b/src/main/jira/adf-inline-markdown.ts @@ -115,7 +115,7 @@ function supportsBareAutolink(value: string): boolean { const authority = /^(?:https?:\/\/|www\.)([^/?#]*)/i.exec(value)?.[1] if (authority === undefined) { // GFM's bare-email grammar is narrower than the angle-autolink local part the scanner accepts. - return /^[-.\w+]+@[-\w]+(?:\.[-\w]+)+$/.test(value) && !/[-\d_]$/.test(value) + return /^[-.\w+]+@[-\w]+(?:\.[A-Za-z0-9][-\w]*)+$/.test(value) && !/[-\d_]$/.test(value) } return /^[\p{L}\p{N}][\p{L}\p{N}.-]*(?::[0-9]+)?$/u.test(authority) } diff --git a/src/main/jira/adf-text-marks.ts b/src/main/jira/adf-text-marks.ts index 81d51412cb2..70168ba725d 100644 --- a/src/main/jira/adf-text-marks.ts +++ b/src/main/jira/adf-text-marks.ts @@ -160,7 +160,11 @@ function joinedTextRuns(children: unknown[]): Record[] { const previous = runs.at(-1) const marks = typeof node.text === 'string' ? JSON.stringify(node.marks ?? []) : '' if (marks && typeof previous?.text === 'string' && marks === previousMarks) { - runs[runs.length - 1] = { ...previous, text: previous.text + node.text } + runs[runs.length - 1] = { + type: 'text', + text: previous.text + node.text, + marks: previous.marks + } } else { runs.push(node) } diff --git a/src/main/jira/markdown-adf.test.ts b/src/main/jira/markdown-adf.test.ts index 5ce3de4a50d..c8c1018d5fb 100644 --- a/src/main/jira/markdown-adf.test.ts +++ b/src/main/jira/markdown-adf.test.ts @@ -786,10 +786,11 @@ it('keeps ambiguous URL authorities active through real Markdown read-back', asy href: 'http://www.foo_bar.com/' }, { text: 'http://-foo.com/', markdown: '', href: 'http://-foo.com/' }, + { text: '*a*@b.com', markdown: '[\\*a\\*@b.com](mailto:*a*@b.com)', href: 'mailto:*a*@b.com' }, { - text: '*foo*@example.com', - markdown: '[\\*foo\\*@example.com](mailto:*foo*@example.com)', - href: 'mailto:*foo*@example.com' + text: '_a_@b.-c.com', + markdown: '[\\_a\\_@b.-c.com](mailto:_a_@b.-c.com)', + href: 'mailto:_a_@b.-c.com' }, { text: ['https://example.com', '/docs'],