Skip to content

Commit 984c365

Browse files
committed
[gfm] use new extended email autolink rule to avoid autolinking email addresses in code spans (fixes markedjs#1218)
1 parent 4ee1c52 commit 984c365

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

lib/marked.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -605,9 +605,8 @@ inline.pedantic = merge({}, inline.normal, {
605605

606606
inline.gfm = merge({}, inline.normal, {
607607
escape: edit(inline.escape).replace('])', '~|])').getRegex(),
608-
url: edit(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/)
609-
.replace('email', inline._email)
610-
.getRegex(),
608+
_extended_email: /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,
609+
url: /^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,
611610
_backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
612611
del: /^~+(?=\S)([\s\S]*?\S)~+/,
613612
text: edit(inline.text)
@@ -616,6 +615,9 @@ inline.gfm = merge({}, inline.normal, {
616615
.getRegex()
617616
});
618617

618+
inline.gfm.url = edit(inline.gfm.url)
619+
.replace('email', inline.gfm._extended_email)
620+
.getRegex();
619621
/**
620622
* GFM + Line Breaks Inline Grammar
621623
*/

0 commit comments

Comments
 (0)