Merge pull request #3768 from seaoak/bugfix/backtick_code_block_on_blockquote_always_terminates_the_blockquote_block

fix: prevent inserting extra new line character into the end of backtick code block

Author: curbengh

lib/plugins/filter/before_post_render/backtick_code_block.js

@@ -63,7 +63,7 @@ function backtickCodeBlock(data) {
       .replace(/{/g, '{')
       .replace(/}/g, '}');
 
-    return `${start}<escape>${content}</escape>${end ? '\n\n' : ''}`;
+    return `${start}<escape>${content}</escape>${end}`;
   });
 }
 

test/fixtures/post_render.js

@@ -29,7 +29,7 @@ exports.content = content;
 exports.expected = [
   '<h1 id="Title"><a href="#Title" class="headerlink" title="Title"></a>Title</h1>',
   util.highlight(code, {lang: 'python'}),
-  '\n\n<p>some content</p>\n',
+  '\n<p>some content</p>\n',
   '<h2 id="Another-title"><a href="#Another-title" class="headerlink" title="Another title"></a>Another title</h2>',
   '<blockquote>',
   '<p>quote content</p>\n',
@@ -41,7 +41,7 @@ exports.expected = [
 exports.expected_disable_nunjucks = [
   '<h1 id="Title"><a href="#Title" class="headerlink" title="Title"></a>Title</h1>',
   util.highlight(code, {lang: 'python'}),
-  '\n\n<p>some content</p>\n',
+  '\n<p>some content</p>\n',
   '<h2 id="Another-title"><a href="#Another-title" class="headerlink" title="Another title"></a>Another title</h2>',
   '<p>{% blockquote %}<br>',
   'quote content<br>',

test/scripts/hexo/post.js

@@ -734,8 +734,7 @@ describe('Post', () => {
       content
     }).then(data => {
       data.content.trim().should.eql([
-        '<blockquote>' + highlighted,
-        '</blockquote>'
+        '<blockquote>' + highlighted + '</blockquote>'
       ].join('\n'));
     });
   });
@@ -802,4 +801,40 @@ describe('Post', () => {
     });
   });
 
+  // test for Issue #3767
+  it('render() - backtick cocde block (followed by a paragraph) in blockquote', () => {
+    const code = 'alert("Hello world")';
+    const highlighted = util.highlight(code);
+    const quotedContent = [
+      'This is a code-block',
+      '',
+      '```',
+      code,
+      '```',
+      '',
+      'This is a following paragraph'
+    ];
+
+    const content = [
+      'Hello',
+      '',
+      ...quotedContent.map(s => '> ' + s)
+    ].join('\n');
+
+    return post.render(null, {
+      content,
+      engine: 'markdown'
+    }).then(data => {
+      data.content.trim().should.eql([
+        '<p>Hello</p>',
+        '<blockquote>',
+        '<p>This is a code-block</p>',
+        highlighted,
+        '',
+        '<p>This is a following paragraph</p>',
+        '</blockquote>'
+      ].join('\n'));
+    });
+  });
+
 });