🔀 Merge branch 'develop'

dudeofawesome · Feb 12, 2018 · f4d0228 · f4d0228
2 parents d0d966a + 7ad4e30
commit f4d0228
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/utils/regexes.dart b/lib/utils/regexes.dart
@@ -2,3 +2,4 @@ final htmlTagA = new RegExp(r'\<a.*?href\=\\?"(' + urlSafeCharacters + r'*)\\?".
 final urlSafeCharacters = r"[a-zA-Z0-9\-\.\_\~\:\/\?\#\[\]\@\!\$\&\'\(\)\*\+\,\;\=]";
 final fullUri = new RegExp(r'(\S+)\:\/\/([^\/\s]+)([\S]*)', caseSensitive: false);
 final looseUrl = new RegExp(r'((\S+)\:\/\/)?([^\/\s]+?\.[^\/\s]{2,})([\S]*)', caseSensitive: false);
+final gfmAutolinkUrl = new RegExp(r'(?:^|[\s*_~(>])(?:(?:https?|ftp):\/\/|www\.)[\w\-][\w\-.]+[^\s<]*', caseSensitive: false);
diff --git a/lib/utils/simple_html_to_markdown.dart b/lib/utils/simple_html_to_markdown.dart
@@ -20,7 +20,7 @@ class SimpleMarkdownConversion {
         new RegExp(r'^([0-9]+)\.', caseSensitive: false),
         (match) => '${match[1]}\\.'
       )
-      .replaceAllMapped(looseUrl, (match) {
+      .replaceAllMapped(gfmAutolinkUrl, (match) {
         try {
           Uri.parse(match[0]);
           return '[${match[0]}](${match[0]})';