Hotfix for blockquoted callouts #13

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mkdocs-callouts"
-version = "1.13.0"
+version = "1.13.1"
 keywords = ["mkdocs", "mkdocs-plugin", "markdown", "callouts", "admonitions", "obsidian"]
 description = "A simple plugin that converts Obsidian style callouts and converts them into mkdocs supported 'admonitions' (a.k.a. callouts)."
 readme = "README.md"

src/mkdocs_callouts/utils.py

@@ -110,6 +110,9 @@ def _convert_block(self, line: str) -> str:
         if match:
             # Store the current indent level and add it to the list if it doesn't exist
             indent_level = match.group(2).count('>')
+            # Guard clause to prevent non-callout blocks from being converted (e.g. code blocks)
+            if 1 not in self.indent_levels and indent_level != 1:
+                return line
             if indent_level not in self.indent_levels:
                 self.indent_levels.append(indent_level)
             return self._parse_block_syntax(match)
@@ -151,7 +154,8 @@ def convert_line(self, line: str) -> str:
         if line is not a block syntax, it will return _convert_content.
         """
         # Toggle in_codefence if line contains a codefence
-        if re.match(r'^\s*```', line):
+        # (If a line contains '```' before any meaningful content, it's a codefence)
+        if re.match(r'^\s*(?:>\s*)*```', line):
             # TODO: Might be _almost_ impossible to do, but at the moment having a codefence containing
             #       callout syntax inside a callout block will convert the callout syntax within the codefence.
             #       (Extremely unlikely scenario, but still)

tests/test_plugin.py

@@ -306,4 +306,27 @@ def test_content_tabs():
     # Example:
     mkdown = '> [!NOTE]\n\t=== "test"\n\t\t> [!NOTE]\n\t\t> Text'
     result = '!!! note\n\t=== "test"\n\t\t!!! note\n\t\t\tText'
+    assert (convert(mkdown) == result)
+
+
+def test_callout_within_blockquotes():
+    # https://github.com/sondregronas/mkdocs-callouts/issues/13
+    mkdown = '> > [!NOTE]\n> > Text'
+    result = '> > [!NOTE]\n> > Text'
+    assert (convert(mkdown) == result)
+
+    mkdown = '> ```\n> > [!NOTE]\n> > Text\n> ```'
+    result = '> ```\n> > [!NOTE]\n> > Text\n> ```'
+    assert (convert(mkdown) == result)
+
+
+def test_invalid_callout_syntax_within_blockquote():
+    # This is incorrect syntax for a callout within a codefence within a blockquote,
+    # but it's still valid markdown and should be preserved
+    mkdown = '> ```\n> [!NOTE]\n> Text\n> ```'
+    result = '> ```\n> [!NOTE]\n> Text\n> ```'
+    assert (convert(mkdown) == result)
+
+    mkdown = '> > [!NOTE]\n> > Text'
+    result = '> > [!NOTE]\n> > Text'
     assert (convert(mkdown) == result)