fix(mentions): allow for usernames with dot, underscore and dash

Closes #574
showdownjs · Oct 16, 2018 · dfeb1e2 · dfeb1e2
1 parent 79ed024
commit dfeb1e2
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 11 deletions.
diff --git a/dist/showdown.js b/dist/showdown.js
diff --git a/dist/showdown.js.map b/dist/showdown.js.map
diff --git a/dist/showdown.min.js b/dist/showdown.min.js
diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
diff --git a/src/subParsers/anchors.js b/src/subParsers/anchors.js
@@ -75,7 +75,7 @@ showdown.subParser('anchors', function (text, options, globals) {
 
   // Lastly handle GithubMentions if option is enabled
   if (options.ghMentions) {
-    text = text.replace(/(^|\s)(\\)?(@([a-z\d\-]+))(?=[.!?;,[\]()]|\s|$)/gmi, function (wm, st, escape, mentions, username) {
+    text = text.replace(/(^|\s)(\\)?(@([a-z\d]+(?:[a-z\d.-]+?[a-z\d]+)*))/gmi, function (wm, st, escape, mentions, username) {
       if (escape === '\\') {
         return st + mentions;
       }

diff --git a/test/features/ghMentions.html b/test/features/ghMentions.html
@@ -1,3 +1,10 @@
 <p>hello <a href="https://github.com/tivie">@tivie</a> how are you?</p>
 <p>this email foo@gmail.com is not parsed</p>
-<p>this @mentions is not parsed also</p>
+<p>this @mentions is not parsed</p>
+<p><a href="https://github.com/john.doe">@john.doe</a></p>
+<p><a href="https://github.com/john-doe">@john-doe</a></p>
+<p>@.johndoe</p>
+<p>@_johndoe</p>
+<p>@-johndoe</p>
+<p><a href="https://github.com/johndoe">@johndoe</a>.</p>
+<p><a href="https://github.com/johndoe">@johndoe</a>-</p>
diff --git a/test/features/ghMentions.md b/test/features/ghMentions.md
@@ -2,4 +2,18 @@ hello @tivie how are you?
 
 this email foo@gmail.com is not parsed
 
-this \@mentions is not parsed also
+this \@mentions is not parsed
+
+@john.doe
+
+@john-doe
+
+@.johndoe
+
+@_johndoe
+
+@-johndoe
+
+@johndoe.
+
+@johndoe-
diff --git a/test/functional/makehtml/cases/issues/#585.error-when-using-image-references.html b/test/functional/makehtml/cases/issues/#585.error-when-using-image-references.html
diff --git a/test/functional/makehtml/cases/issues/#585.error-when-using-image-references.md b/test/functional/makehtml/cases/issues/#585.error-when-using-image-references.md