Fixed markedjs/marked#465

ts-stack · Dec 18, 2017 · e325fbc · e325fbc
1 parent 7b216a5
commit e325fbc
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 35 deletions.
diff --git a/src/block-lexer.ts b/src/block-lexer.ts
@@ -44,10 +44,6 @@ block.list = new ExtendRegexp(block.list)
 .setGroup('def', '\\n+(?=' + block.def.source + ')')
 .getRegexp();
 
-block.blockquote = new ExtendRegexp(block.blockquote)
-.setGroup('def', block.def)
-.getRegexp();
-
 block._tag = '(?!(?:'
   + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
   + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'

diff --git a/test/tests/def_blocks.html b/test/tests/def_blocks.html
@@ -6,7 +6,8 @@
 <hr>
 
 <blockquote>
-  <p>hello</p>
+  <p>hello
+[2]: hello</p>
 </blockquote>
 
 
@@ -24,5 +25,6 @@
 <blockquote>
   <p>foo
 bar
+[1]: foo
 bar</p>
 </blockquote>
diff --git a/test/tests/toplevel_paragraphs.gfm.html b/test/tests/toplevel_paragraphs.gfm.html
@@ -1,30 +1,30 @@
 <p>hello world
-    how are you
-    how are you</p>
+    text after spaces
+    text after spaces</p>
 
-<p>hello world</p>
-<pre><code>how are you</code></pre>
+<p>paragraph before code</p>
+<pre><code>text inside block code</code></pre>
 
-<p>hello world</p>
+<p>paragraph before hr</p>
 <hr>
 
-<p>hello world</p>
+<p>paragraph before head with hash</p>
 <h1 id="how-are-you">how are you</h1>
 
-<p>hello world</p>
+<p>paragraph before head with equals</p>
 <h1 id="how-are-you">how are you</h1>
 
-<p>hello world</p>
-<blockquote><p>how are you</p></blockquote>
+<p>paragraph before blockquote</p>
+<blockquote><p>text for blockquote</p></blockquote>
 
-<p>hello world</p>
-<ul><li>how are you</li></ul>
+<p>paragraph before list</p>
+<ul><li>text inside list</li></ul>
 
-<p>hello world</p>
-<div>how are you</div>
+<p>paragraph before div</p>
+<div>text inside div</div>
 
-<p>hello world
-<span>how are you</span></p>
+<p>paragraph with span
+<span>text inside span</span></p>
 
 <p>hello <a href="/are/you">world</a>
 </p>

diff --git a/test/tests/toplevel_paragraphs.gfm.text b/test/tests/toplevel_paragraphs.gfm.text
@@ -1,35 +1,36 @@
 hello world
-    how are you
-    how are you
+    text after spaces
+    text after spaces
 
-hello world
+paragraph before code
 ```
-how are you
+text inside block code
 ```
 
-hello world
+paragraph before hr
 * * *
 
-hello world
+paragraph before head with hash
 # how are you
 
-hello world
+paragraph before head with equals
 how are you
 ===========
 
-hello world
-> how are you
+paragraph before blockquote
+> text for blockquote
 
-hello world
-* how are you
+paragraph before list
+* text inside list
 
-hello world
-<div>how are you</div>
+paragraph before div
+<div>text inside div</div>
 
-hello world
-<span>how are you</span>
+paragraph with span
+<span>text inside span</span>
 
 hello [world][how]
+
 [how]: /are/you
 
 <div>hello</div>