Merge pull request #257 from alexconst/fix/url_regex

Fix URL syntax regex

diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index 9e0eb497d4d3a5935013489c0685bbaf3d4cea86..07adae9e193184e991e9c3a3225839175833b1ec 100644 (file)
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -62,8 +62,8 @@ execute 'syn region mkdLink matchgroup=mkdDelimiter  start="\\\@<!!\?\[" end="\n
 
 " Autolink without angle brackets.
 " mkd  inline links:           protocol   optional  user:pass@       sub/domain                 .com, .co.uk, etc      optional port   path/querystring/hash fragment
-"                            ------------ _____________________ --------------------------- ________________________ ----------------- __
-syntax match   mkdInlineURL /https\?:\/\/\(\w\+\(:\w\+\)\?@\)\?\([A-Za-z][-_0-9A-Za-z]*\.\)\{1,}\(\w\{2,}\.\?\)\{1,}\(:[0-9]\{1,5}\)\?\S*/
+"                            ------------ _____________________ ----------------------------- ________________________ ----------------- __
+syntax match   mkdInlineURL /https\?:\/\/\(\w\+\(:\w\+\)\?@\)\?\([A-Za-z0-9][-_0-9A-Za-z]*\.\)\{1,}\(\w\{2,}\.\?\)\{1,}\(:[0-9]\{1,5}\)\?\S*/
 
 " Autolink with parenthesis.
 syntax region  mkdInlineURL matchgroup=mkdDelimiter start="(\(https\?:\/\/\(\w\+\(:\w\+\)\?@\)\?\([A-Za-z][-_0-9A-Za-z]*\.\)\{1,}\(\w\{2,}\.\?\)\{1,}\(:[0-9]\{1,5}\)\?\S*)\)\@=" end=")"

diff --git a/test/syntax.vader b/test/syntax.vader
index 8ac0a2823047634b20e4d1d0b437ab5adeb655ed..5286b0bd79ac84d2431b01f1a632c59bf4f39796 100644 (file)
--- a/test/syntax.vader
+++ b/test/syntax.vader
@@ -217,6 +217,12 @@ Execute (autolink):
   AssertEqual SyntaxOf('>'), 'mkdDelimiter'
   AssertNotEqual SyntaxOf('c'), 'mkdInlineURL'
 
+Given markdown;
+http://12monkeys.foo
+
+Execute (autolink with domain starting with a number):
+  AssertEqual SyntaxOf('12monkeys'), 'mkdInlineURL'
+
 Given markdown;
 <HtTp://a>