]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Improve regexp performance of italic
authorHiroshi Shirosaki <h.shirosaki@gmail.com>
Tue, 19 Jan 2016 04:40:05 +0000 (13:40 +0900)
committerHiroshi Shirosaki <h.shirosaki@gmail.com>
Tue, 19 Jan 2016 04:40:05 +0000 (13:40 +0900)
Add tests for escaped asterisks.

syntax/markdown.vim
test/syntax.vader

index ec12ef6a004fd99043f0ca523c60a278007d5782..452a71730516c863e03cdedd671acf52bebbf9f7 100644 (file)
@@ -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
index d985b2c1bccdbf2716f9b388d580f0c313217fc3..6f0a6943e888a3625cd5461b6a36d749dc5c141c 100644 (file)
@@ -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