From: Ciro Santilli Date: Sun, 28 Sep 2014 20:42:04 +0000 (+0200) Subject: Merge pull request #122 from cirosantilli/paren X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/529ba45874058c7a6e3fb2c1500623d452e02a32?hp=dd526fd23ca26dd31d87e64144e27e95aff94b8a Merge pull request #122 from cirosantilli/paren Fix parenthesis () and square brackets [] that were rendered as links when not in link. --- diff --git a/syntax/mkd.vim b/syntax/mkd.vim index 4677f65..38c3502 100644 --- a/syntax/mkd.vim +++ b/syntax/mkd.vim @@ -94,7 +94,7 @@ syn region htmlH6 start="^\s*######" end="\($\|#\+\)" contain syn match htmlH1 /^.\+\n=\+$/ contains=@Spell syn match htmlH2 /^.\+\n-\+$/ contains=@Spell -syn cluster mkdNonListItem contains=htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdID,mkdURL,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdIndentCode,mkdListItem,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6 +syn cluster mkdNonListItem contains=htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdIndentCode,mkdListItem,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6 "highlighting for Markdown groups HtmlHiLink mkdString String diff --git a/test/syntax.md b/test/syntax.md index 22f3b1a..d031c2f 100644 --- a/test/syntax.md +++ b/test/syntax.md @@ -15,3 +15,75 @@ def f 0 end ``` + +# Links + +[a](b "c") + +[a]() + +[good spell](a) + +[badd spell](a) + +[a](b "c") + +[a]( b +"c" ) + +a (`a`) b. Fix: + +Escaped: + +\[a](b) + +[a\]b](c) + +## Known failures + +Escape does not work: + +[a\](b) + +Should not be links because of whitespace: + +[a] (b) + +[a](a +b) + +[a](a b) + +# Reference links + +Single links: + +[a][b] + +[good spell][a] + +[badd spell][a] + +[a][] + +[a] [] + +[a][b] c [d][e] + +Reference link followed by inline link: + +[a] [b](c) + +## Known failures + +Should be shortcut reference links: + +[a] + +[a] b [c] + +Should be a single link: + +[a] [b] + +[a] b [c](d) diff --git a/test/syntax.vader b/test/syntax.vader index 9d2e866..26f1990 100644 --- a/test/syntax.vader +++ b/test/syntax.vader @@ -9,3 +9,22 @@ Given mkd (italic); Execute (SyntaxOf(pattern)): AssertEqual SyntaxOf('i'), 'htmlItalic' + +Given mkd; +[a](b) + +Execute (link with title): + AssertEqual SyntaxOf('a'), 'mkdLink' + AssertEqual SyntaxOf('b'), 'mkdURL' + +Given mkd; +(a) + +Execute (parenthesis not in link): + AssertNotEqual SyntaxOf('a'), 'mkdLink' + +Given mkd; +[a](b) c [d](e) + +Execute (multiple links on a line): + AssertEqual SyntaxOf('c'), ''