From 127a28e9b0a25a6c1d866cfdb7686bdf86182553 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Fri, 5 Feb 2021 16:51:37 +0000
Subject: [PATCH] Desktop: Fixes #4416: Fixed formatting of consecutive code
 blocks

---
 packages/app-cli/tests/html_to_md/code_4.html | 1 +
 packages/app-cli/tests/html_to_md/code_4.md   | 7 +++++++
 packages/app-cli/tests/html_to_md/code_5.html | 8 ++++++++
 packages/app-cli/tests/html_to_md/code_5.md   | 7 +++++++
 packages/turndown/src/commonmark-rules.js     | 2 +-
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 packages/app-cli/tests/html_to_md/code_4.html
 create mode 100644 packages/app-cli/tests/html_to_md/code_4.md
 create mode 100644 packages/app-cli/tests/html_to_md/code_5.html
 create mode 100644 packages/app-cli/tests/html_to_md/code_5.md

diff --git a/packages/app-cli/tests/html_to_md/code_4.html b/packages/app-cli/tests/html_to_md/code_4.html
new file mode 100644
index 0000000000..3e0d1932fc
--- /dev/null
+++ b/packages/app-cli/tests/html_to_md/code_4.html
@@ -0,0 +1 @@
+<pre><code>one block</code></pre><pre><code>two block</code></pre>
\ No newline at end of file
diff --git a/packages/app-cli/tests/html_to_md/code_4.md b/packages/app-cli/tests/html_to_md/code_4.md
new file mode 100644
index 0000000000..0dc3e3633c
--- /dev/null
+++ b/packages/app-cli/tests/html_to_md/code_4.md
@@ -0,0 +1,7 @@
+```
+one block
+```
+
+```
+two block
+```
\ No newline at end of file
diff --git a/packages/app-cli/tests/html_to_md/code_5.html b/packages/app-cli/tests/html_to_md/code_5.html
new file mode 100644
index 0000000000..ff008e9271
--- /dev/null
+++ b/packages/app-cli/tests/html_to_md/code_5.html
@@ -0,0 +1,8 @@
+<div class="joplin-editable">
+<pre class="joplin-source" data-joplin-language="js" data-joplin-source-open="&#96;&#96;&#96;js&#10;" data-joplin-source-close="&#10;&#96;&#96;&#96;">var a = 1;</pre>
+<pre class="hljs"><code><span class="hljs-keyword">var</span> a = <span class="hljs-number">1</span>;</code></pre>
+</div>
+<div class="joplin-editable">
+<pre class="joplin-source" data-joplin-language="" data-joplin-source-open="&#96;&#96;&#96;&#10;" data-joplin-source-close="&#10;&#96;&#96;&#96;">test</pre>
+<pre class="hljs"><code><span class="hljs-built_in">test</span></code></pre>
+</div>
\ No newline at end of file
diff --git a/packages/app-cli/tests/html_to_md/code_5.md b/packages/app-cli/tests/html_to_md/code_5.md
new file mode 100644
index 0000000000..33535ce369
--- /dev/null
+++ b/packages/app-cli/tests/html_to_md/code_5.md
@@ -0,0 +1,7 @@
+```js
+var a = 1;
+```
+
+```
+test
+```
\ No newline at end of file
diff --git a/packages/turndown/src/commonmark-rules.js b/packages/turndown/src/commonmark-rules.js
index 74a7e5047a..6087a86fdd 100644
--- a/packages/turndown/src/commonmark-rules.js
+++ b/packages/turndown/src/commonmark-rules.js
@@ -591,7 +591,7 @@ rules.joplinSourceBlock = {
     const info = joplinEditableBlockInfo(node);
     if (!info) return;
 
-    return info.openCharacters + info.content + info.closeCharacters;
+    return '\n\n' + info.openCharacters + info.content + info.closeCharacters + '\n\n';
   }
 }