Improve regexp performance of italic

Add tests for escaped asterisks.

diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index ec12ef6a004fd99043f0ca523c60a278007d5782..452a71730516c863e03cdedd671acf52bebbf9f7 100644 (file)
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -35,8 +35,8 @@ syn case ignore
 syn sync linebreaks=1
 
 "additions to HTML groups
 syn sync linebreaks=1
 
 "additions to HTML groups

-syn region htmlItalic start="\\\@<!\*\ze\S" end="\S\zs\\\@<!\*" keepend oneline
-syn region htmlItalic start="\(^\|\s\)\@<=_\|\\\@<!_\([^_]\+\s\)\@=" end="\S\@<=[^\\]_\|[^\\]_\S\@=" keepend oneline
+syn region htmlItalic start="\\\@<!\*\ze[^\\\*\s]" end="[^\\\*\s]\zs\*" keepend oneline
+syn region htmlItalic start="\\\@<!_\ze[^\\_\s]" end="[^\\_\s]\zs_" keepend oneline

 syn region htmlBold start="\*\*\ze\S" end="\S\zs\*\*" keepend oneline
 syn region htmlBold start="__\ze\S" end="\S\zs__" keepend oneline
 syn region htmlBoldItalic start="\*\*\*\ze\S" end="\S\zs\*\*\*" keepend oneline
 syn region htmlBold start="\*\*\ze\S" end="\S\zs\*\*" keepend oneline
 syn region htmlBold start="__\ze\S" end="\S\zs__" keepend oneline
 syn region htmlBoldItalic start="\*\*\*\ze\S" end="\S\zs\*\*\*" keepend oneline

diff --git a/test/syntax.vader b/test/syntax.vader
index d985b2c1bccdbf2716f9b388d580f0c313217fc3..6f0a6943e888a3625cd5461b6a36d749dc5c141c 100644 (file)
--- a/test/syntax.vader
+++ b/test/syntax.vader
@@ -55,6 +55,15 @@ Execute (italic with escaped underscores):
   AssertEqual SyntaxOf('c'), 'htmlItalic'
   AssertNotEqual SyntaxOf('d'), 'htmlItalic'
 
   AssertEqual SyntaxOf('c'), 'htmlItalic'
   AssertNotEqual SyntaxOf('d'), 'htmlItalic'
 

+Given markdown;
+a *b\*c* d
+
+Execute (italic with escaped asterisks):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+

 Given markdown;
 a __b\_\_c__ d
 
 Given markdown;
 a __b\_\_c__ d