From 7d44103e086d99bf086133a68efb4a03f93563f7 Mon Sep 17 00:00:00 2001
From: Taneli Hukkinen <hukkinj1@users.noreply.github.com>
Date: Sun, 25 Apr 2021 04:14:12 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20Raise=20HTML=20blocks=20p?=
 =?UTF-8?q?riority=20to=20resolve=20conflict=20with=20headings=20(#158)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sibling to upstream commit: https://github.com/markdown-it/markdown-it/commit/309c03a9e856ad5f39ea5e7c066198a93b9331fb
---
 markdown_it/parser_block.py                   |  2 +-
 markdown_it/port.yaml                         |  6 +++---
 tests/test_api/test_main.py                   |  4 ++--
 tests/test_port/fixtures/commonmark_extras.md | 18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/markdown_it/parser_block.py b/markdown_it/parser_block.py
index dd002354..8c0e8ab3 100644
--- a/markdown_it/parser_block.py
+++ b/markdown_it/parser_block.py
@@ -24,9 +24,9 @@
     ("hr", rules_block.hr, ["paragraph", "reference", "blockquote", "list"]),
     ("list", rules_block.list_block, ["paragraph", "reference", "blockquote"]),
     ("reference", rules_block.reference),
+    ("html_block", rules_block.html_block, ["paragraph", "reference", "blockquote"]),
     ("heading", rules_block.heading, ["paragraph", "reference", "blockquote"]),
     ("lheading", rules_block.lheading),
-    ("html_block", rules_block.html_block, ["paragraph", "reference", "blockquote"]),
     ("paragraph", rules_block.paragraph),
 ]
 
diff --git a/markdown_it/port.yaml b/markdown_it/port.yaml
index 565f0143..e457c619 100644
--- a/markdown_it/port.yaml
+++ b/markdown_it/port.yaml
@@ -1,7 +1,7 @@
 - package: markdown-it/markdown-it
-  version: 12.0.4
-  commit: cd5296f1e7de2b978526178631859c18bb9d9928
-  date: Mar 27, 2021
+  version: 12.0.5
+  commit: 3740146fc9c92ea15fdc6a358137ec7b68f05f4b
+  date: Apr 14, 2021
   notes:
     - Rename variables that use python built-in names, e.g.
       - `max` -> `maximum`
diff --git a/tests/test_api/test_main.py b/tests/test_api/test_main.py
index 64dcb506..6f855289 100644
--- a/tests/test_api/test_main.py
+++ b/tests/test_api/test_main.py
@@ -23,9 +23,9 @@ def test_get_rules():
             "hr",
             "list",
             "reference",
+            "html_block",
             "heading",
             "lheading",
-            "html_block",
             "paragraph",
         ],
         "inline": [
@@ -63,9 +63,9 @@ def test_load_presets():
             "hr",
             "list",
             "reference",
+            "html_block",
             "heading",
             "lheading",
-            "html_block",
             "paragraph",
         ],
         "inline": [
diff --git a/tests/test_port/fixtures/commonmark_extras.md b/tests/test_port/fixtures/commonmark_extras.md
index 20523d15..87b4f7c9 100644
--- a/tests/test_port/fixtures/commonmark_extras.md
+++ b/tests/test_port/fixtures/commonmark_extras.md
@@ -629,3 +629,21 @@ baz</p>
 </blockquote>
 </blockquote>
 .
+
+Issue #772. Header rule should not interfere with html tags.
+.
+<!--
+==
+-->
+
+<pre>
+==
+</pre>
+.
+<!--
+==
+-->
+<pre>
+==
+</pre>
+.