Merge pull request #582 from Crozzers/fcb-and-lists

Fix fenced code blocks breaking lists (#580)
trentm · May 27, 2024 · e7d753f · e7d753f
2 parents 5aae144 + d7b6863
commit e7d753f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -12,6 +12,7 @@
 - [pull #576] Fix `html`, `head` and `body` tags being wrapped in `<p>` tags (#575)
 - [pull #581] Add type hints (#562)
 - [pull #581] Drop Python 3.6 and 3.7 support
+- [pull #582] Fix fenced code blocks breaking lists (#580)
 
 
 ## python-markdown2 2.4.13

diff --git a/lib/markdown2.py b/lib/markdown2.py
@@ -2872,7 +2872,7 @@ def sub(self, match: re.Match) -> str:
 
         tags = self.tags(lexer_name)
 
-        return "\n%s%s%s\n%s\n" % (leading_indent, tags[0], codeblock, tags[1])
+        return "\n%s%s%s\n%s%s\n" % (leading_indent, tags[0], codeblock, leading_indent, tags[1])
 
     def run(self, text):
         return self.fenced_code_block_re.sub(self.sub, text)

diff --git a/test/tm-cases/fenced_code_blocks_simple.html b/test/tm-cases/fenced_code_blocks_simple.html
@@ -12,3 +12,16 @@
 
 <pre><code>    is indentation maintained?
 </code></pre>
+
+<p>Here's one in a list, with another one following (see #580):</p>
+
+<ul>
+<li>List 1
+<pre><code>code 1
+
+code 2
+</code></pre></li>
+</ul>
+
+<pre><code>code 3
+</code></pre>
diff --git a/test/tm-cases/fenced_code_blocks_simple.text b/test/tm-cases/fenced_code_blocks_simple.text
@@ -14,3 +14,16 @@ Here is one at the end of the file:
 ```
     is indentation maintained?
 ```
+
+Here's one in a list, with another one following (see #580):
+
+* List 1
+  ```
+  code 1
+
+  code 2
+  ```
+
+```
+code 3
+```