Handle nesting of old-school Admonition-like extensions with Blocks (#2795)

Fixes #2794

Author: facelessuser

docs/src/markdown/about/changelog.md

@@ -3,6 +3,11 @@ icon: lucide/scroll-text
 ---
 # Changelog
 
+## 10.17.2
+
+-   **FIX**: Blocks: Blocks extensions will now better handle nesting of indented style Admonitions, Details, and Tabbed
+    and other non-conflicting blocks.
+
 ## 10.17.1
 
 -   **FIX**: Fix an issue where Highlight can override another extension in the "registered" list in Python Markdown.

docs/src/markdown/faq.md

@@ -5,7 +5,9 @@ icon: lucide/circle-question-mark
 
 ## Function References in YAML
 
-> How do I specify function references in YAML if I am using a module like [MkDocs][mkdocs]?
+/// question
+How do I specify function references in YAML if I am using a module like [MkDocs][mkdocs]?
+///
 
 Pymdown Extensions has a number of extensions that expose customization via options that take function references. If
 you are using a project like [MkDocs][mkdocs], which allows a user to configure Python Markdown extensions via YAML,
@@ -47,7 +49,9 @@ markdown_extensions:
 
 ## GitHub-ish Configurations
 
-> How do I get GitHub Flavored Markdown?
+/// question
+How do I get GitHub Flavored Markdown?
+///
 
 A recommended GitHub configuration is provided below to emulate a setup that gives a GitHub feel.
 

pymdownx/__meta__.py

@@ -193,5 +193,5 @@ def parse_version(ver: str) -> Version:
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(10, 17, 1, "final")
+__version_info__ = Version(10, 17, 2, "final")
 __version__ = __version_info__._get_canonical()

pymdownx/blocks/__init__.py

@@ -452,6 +452,22 @@ def parse_blocks(self, blocks: list[str], current_parent: etree.Element) -> None
         if self.stack:
             self.stack[-1].hungry = True
 
+    def capture_leaked_content(self, parent: etree.Element, entry: BlockEntry) -> None:
+        """
+        Capture leaked content.
+
+        Old school, non-block admonitions, details,
+        and content tabs strongly control where there content is inserted and
+        can cause content leakage outside of the Blocks container.
+        Look for such content and pull it back into the container if found.
+        """
+
+        last_child = self.lastChild(parent)
+        if last_child is not None and last_child is not entry.el:
+            target = entry.block.on_add(entry.el)
+            parent.remove(last_child)
+            target.append(last_child)
+
     def run(self, parent: etree.Element, blocks: list[str]) -> None:
         """Convert to details/summary block."""
 
@@ -492,6 +508,10 @@ def run(self, parent: etree.Element, blocks: list[str]) -> None:
             for r in range(len(self.stack)):
                 entry = self.stack[r]
                 if entry.hungry and parent is entry.parent:
+
+                    # Capture leaked content from old-school extensions: admonition, details, tabbed, etc.
+                    self.capture_leaked_content(parent, entry)
+
                     # Get the target element and parse
                     entry.hungry = False
                     self.parse_blocks(blocks, parent)

tests/test_extensions/test_blocks/test_general_blocks.py

@@ -499,7 +499,13 @@ def test_md_in_html_inserted_correctly(self):
 class TestBlocksTab(util.MdCase):
     """Test Blocks tab cases."""
 
-    extension = ['pymdownx.blocks.tab', 'pymdownx.superfences', 'markdown.extensions.def_list', 'pymdownx.details']
+    extension = [
+        'admonition',
+        'pymdownx.blocks.tab',
+        'pymdownx.superfences',
+        'markdown.extensions.def_list',
+        'pymdownx.details'
+    ]
     extension_configs = {
         'pymdownx.blocks.tab': {'alternate_style': True}
     }
@@ -897,3 +903,62 @@ def test_tabbed_complex_list_unindented_content(self):
             ''',  # noqa: E501
             True
         )
+
+    def test_nesting_with_legacy_style(self):
+        """Test nesting with legacy style admonitions."""
+
+        self.check_markdown(
+            '''
+            !!! note "Admonition 1"
+
+                Admonition 1
+
+                /// tab | Tab 1
+
+                Test tab 1
+
+                !!! note "Admonition 2"
+
+                    Admonition 2
+
+                    //// tab | Tab 2
+
+                    Test tab 2
+
+                    !!! note "Admonition 3"
+
+                        Admonition 3
+
+                    ////
+                ///
+            ''',
+            '''
+            <div class="admonition note">
+            <p class="admonition-title">Admonition 1</p>
+            <p>Admonition 1</p>
+            <div class="tabbed-set tabbed-alternate" data-tabs="1:1"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><div class="tabbed-labels"><label for="__tabbed_1_1">Tab 1</label></div>
+            <div class="tabbed-content">
+            <div class="tabbed-block">
+            <p>Test tab 1</p>
+            <div class="admonition note">
+            <p class="admonition-title">Admonition 2</p>
+            <p>Admonition 2</p>
+            <div class="tabbed-set tabbed-alternate" data-tabs="2:1"><input checked="checked" id="__tabbed_2_1" name="__tabbed_2" type="radio" /><div class="tabbed-labels"><label for="__tabbed_2_1">Tab 2</label></div>
+            <div class="tabbed-content">
+            <div class="tabbed-block">
+            <p>Test tab 2</p>
+            <div class="admonition note">
+            <p class="admonition-title">Admonition 3</p>
+            <p>Admonition 3</p>
+            </div>
+            </div>
+            </div>
+            </div>
+            </div>
+            </div>
+            </div>
+            </div>
+            </div>
+            ''',  # noqa: E501
+            True
+        )