From: Hiroshi Shirosaki <h.shirosaki@gmail.com>
Date: Wed, 20 Jan 2016 06:01:09 +0000 (+0900)
Subject: Remove online with italic and bold syntax
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/1d04101ca7e3de1b622f356e33cfbaeb5e358bc9?ds=inline

Remove online with italic and bold syntax

We fixed some issues without oneline option.
Add unit tests.
Fix #172
---

diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index 79e1a3c..67043a1 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -42,12 +42,12 @@ if has('conceal')
 endif
 
 "additions to HTML groups
-syn region htmlItalic start="\\\@<!\*\ze[^\\\*\t ]" end="[^\\\*\t ]\zs\*" keepend oneline
-syn region htmlItalic start="\\\@<!_\ze[^\\_\t ]" end="[^\\_\t ]\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 htmlBoldItalic start="___\ze\S" end="\S\zs___" keepend oneline
+syn region htmlItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]" end="[^\\\*\t ]\zs\*\ze\_W" keepend
+syn region htmlItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend
+syn region htmlBold start="\*\*\ze\S" end="\S\zs\*\*" keepend
+syn region htmlBold start="__\ze\S" end="\S\zs__" keepend
+syn region htmlBoldItalic start="\*\*\*\ze\S" end="\S\zs\*\*\*" keepend
+syn region htmlBoldItalic start="___\ze\S" end="\S\zs___" keepend
 
 " [link](URL) | [link][id] | [link][] | ![image](URL)
 syn region mkdFootnotes matchgroup=mkdDelimiter start="\[^"    end="\]"
diff --git a/test/syntax.vader b/test/syntax.vader
index b5d1937..894ed0e 100644
--- a/test/syntax.vader
+++ b/test/syntax.vader
@@ -30,6 +30,13 @@ Execute (italic):
   AssertEqual SyntaxOf('b'), 'htmlItalic'
   AssertNotEqual SyntaxOf('c'), 'htmlItalic'
 
+Given markdown;
+_a_b_
+
+Execute (italic text has underscores):
+  AssertEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+
 Given markdown;
 a \*b\* c
 
@@ -55,6 +62,14 @@ Execute (italic with escaped underscores):
   AssertEqual SyntaxOf('c'), 'htmlItalic'
   AssertNotEqual SyntaxOf('d'), 'htmlItalic'
 
+Given markdown;
+a_b_c
+
+Execute (not italic underscores within text):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
 Given markdown;
 a *b\*c* d
 
@@ -73,6 +88,66 @@ Execute (bold with escaped underscores):
   AssertEqual SyntaxOf('c'), 'htmlBold'
   AssertNotEqual SyntaxOf('d'), 'htmlBold'
 
+Given markdown;
+_a b
+c_ d
+
+Execute (italic with underscores in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+__a b
+c__ d
+
+Execute (bold with underscores in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+___a b
+c___ d
+
+Execute (bold italic with underscores in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('b'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('c'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlBoldItalic'
+
+Given markdown;
+*a b
+c* d
+
+Execute (italic with asterisks in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+**a b
+c** d
+
+Execute (bold with asterisks in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+***a b
+c*** d
+
+Execute (bold italic with asterisks in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('b'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('c'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlBoldItalic'
+
 # Links
 
 Given markdown;