Merge pull request trentm#145 from trentm/nick-fenced-indentation

nicholasserra · nicholasserra · commit 5da4d0b08884 · 2014-01-21T11:39:46.000-08:00
Don't parse code block inside another code block
diff --git a/lib/markdown2.py b/lib/markdown2.py
@@ -1564,6 +1564,9 @@ def _do_code_blocks(self, text):
               )+
             )
             ((?=^[ ]{0,%d}\S)|\Z)   # Lookahead for non-space at line-start, or end of doc
+            # Lookahead to make sure this block isn't already in a code block.
+            # Needed when syntax highlighting is being used.
+            (?![^<]*\</code\>)
             ''' % (self.tab_width, self.tab_width),
             re.M | re.X)
         return code_block_re.sub(self._code_block_sub, text)
diff --git a/test/tm-cases/fenced_code_blocks_syntax_indentation.html b/test/tm-cases/fenced_code_blocks_syntax_indentation.html
@@ -0,0 +1,5 @@
+<div class="codehilite"><pre><code><span class="k">def</span> <span class="nf">foo</span><span class="p">():</span>
+    <span class="k">print</span> <span class="s">&quot;foo&quot;</span>
+
+    <span class="k">print</span> <span class="s">&quot;bar&quot;</span>
+</code></pre></div>
diff --git a/test/tm-cases/fenced_code_blocks_syntax_indentation.opts b/test/tm-cases/fenced_code_blocks_syntax_indentation.opts
@@ -0,0 +1 @@
+{"extras": ["fenced-code-blocks"]}
diff --git a/test/tm-cases/fenced_code_blocks_syntax_indentation.tags b/test/tm-cases/fenced_code_blocks_syntax_indentation.tags
@@ -0,0 +1 @@
+extra fenced-code-blocks pygments indentation
diff --git a/test/tm-cases/fenced_code_blocks_syntax_indentation.text b/test/tm-cases/fenced_code_blocks_syntax_indentation.text
@@ -0,0 +1,6 @@
+```python
+def foo():
+    print "foo"
+
+    print "bar"
+```

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+extra fenced-code-blocks pygments indentation`