Merge pull request #76 from adamtheturtle/admonition-pure-children

Author: adamtheturtle

sample/index.rst

@@ -15,6 +15,22 @@ This is **bold** and *italic* and ``inline code``.
 
    This is a warning that demonstrates the warning admonition support.
 
+   .. code-block:: python
+
+      """Python code nested in an admonition."""
+
+
+      def hello_world() -> int:
+          """Return the answer."""
+          return 42
+
+
+      hello_world()
+
+   .. warning::
+
+      This is a warning that demonstrates the warning admonition support.
+
 .. tip::
 
    This is a helpful tip that demonstrates the tip admonition support.

src/sphinx_notion/__init__.py

@@ -249,12 +249,39 @@ def _create_admonition_callout(
     emoji: str,
     color: Color,
 ) -> list[NotionObject[Any]]:
+    """Create a Notion Callout block for admonition nodes.
+
+    The first child (typically a paragraph) becomes the callout text,
+    and any remaining children become nested blocks within the callout.
     """
-    Create a Notion Callout block for admonition nodes.
-    """
-    rich_text = _create_rich_text_from_children(node=node)
     block = UnoCallout(text="", icon=Emoji(emoji=emoji), color=color)
-    block.rich_text = rich_text
+
+    # Use the first child as the callout text
+    first_child = node.children[0]
+    if isinstance(first_child, nodes.paragraph):
+        rich_text = _create_rich_text_from_children(node=first_child)
+        block.rich_text = rich_text
+        # Process remaining children as nested blocks
+        children_to_process = node.children[1:]
+    else:
+        # If first child is not a paragraph, use empty text
+        block.rich_text = Text.from_plain_text(text="")
+        # Process all children as nested blocks (including the first)
+        children_to_process = node.children
+
+    # Process children as nested blocks
+    for child in children_to_process:
+        for child_block in list(
+            _process_node_to_blocks(
+                child,
+                section_level=1,
+            )
+        ):
+            # Add nested blocks as children to the callout
+            # Remove pyright ignore once we have
+            # https://github.com/ultimate-notion/ultimate-notion/issues/94.
+            block.obj_ref.value.children.append(child_block.obj_ref)  # pyright: ignore[reportUnknownMemberType]
+
     return [block]
 
 

tests/test_integration.py

@@ -731,8 +731,7 @@ def test_admonition_single_line(
     rst_content = f"""
         Regular paragraph.
 
-        .. {admonition_type}::
-           {message}
+        .. {admonition_type}:: {message}
 
         Another paragraph.
     """
@@ -773,19 +772,69 @@ def test_admonition_multiline(
 ) -> None:
     """Test that admonitions with multiple paragraphs work.
 
-    For now, we ignore children and just combine all text content.
+    The first paragraph becomes the callout text, and subsequent
+    paragraphs become nested blocks within the callout.
     """
     rst_content = f"""
         .. {admonition_type}::
            This is the first paragraph of the {admonition_type}.
 
-           This is the second paragraph that should be combined.
+           This is the second paragraph that should be nested.
     """
-    # Create the callout with expected rich text structure
     callout = UnoCallout(text="", icon=Emoji(emoji=emoji), color=color)
     callout.rich_text = text(
         text=f"This is the first paragraph of the {admonition_type}."
-    ) + text(text="This is the second paragraph that should be combined.")
+    )
+
+    nested_paragraph = UnoParagraph(
+        text="This is the second paragraph that should be nested."
+    )
+
+    callout.obj_ref.value.children.append(nested_paragraph.obj_ref)  # pyright: ignore[reportUnknownMemberType]
+
+    expected_objects: list[NotionObject[Any]] = [
+        callout,
+    ]
+    _assert_rst_converts_to_notion_objects(
+        rst_content=rst_content,
+        expected_objects=expected_objects,
+        make_app=make_app,
+        tmp_path=tmp_path,
+    )
+
+
+def test_admonition_with_code_block(
+    make_app: Callable[..., SphinxTestApp],
+    tmp_path: Path,
+) -> None:
+    """
+    Test that admonitions can contain code blocks as nested children.
+    """
+    rst_content = """
+        .. note::
+           This note contains a code example.
+
+           .. code-block:: python
+
+              def hello():
+                  print("Hello, world!")
+
+           The code above demonstrates a simple function.
+    """
+
+    callout = UnoCallout(text="", icon=Emoji(emoji="📝"), color=Color.BLUE)
+    callout.rich_text = text(text="This note contains a code example.")
+
+    nested_code_block = _create_code_block_without_annotations(
+        content='def hello():\n    print("Hello, world!")',
+        language=CodeLang.PYTHON,
+    )
+    nested_paragraph = UnoParagraph(
+        text="The code above demonstrates a simple function."
+    )
+
+    callout.obj_ref.value.children.append(nested_code_block.obj_ref)  # pyright: ignore[reportUnknownMemberType]
+    callout.obj_ref.value.children.append(nested_paragraph.obj_ref)  # pyright: ignore[reportUnknownMemberType]
 
     expected_objects: list[NotionObject[Any]] = [
         callout,
@@ -798,6 +847,48 @@ def test_admonition_multiline(
     )
 
 
+def test_admonition_with_code_block_first(
+    make_app: Callable[..., SphinxTestApp],
+    tmp_path: Path,
+) -> None:
+    """Test admonition with code block as first child (not paragraph).
+
+    This tests the else clause when first child is not a paragraph.
+    """
+    rst_content = """
+        .. note::
+
+           .. code-block:: python
+
+              def hello():
+                  print("Hello, world!")
+
+           This paragraph comes after the code block.
+    """
+
+    callout = UnoCallout(text="", icon=Emoji(emoji="📝"), color=Color.BLUE)
+    callout.rich_text = text(text="")
+
+    nested_code_block = _create_code_block_without_annotations(
+        content='def hello():\n    print("Hello, world!")',
+        language=CodeLang.PYTHON,
+    )
+    nested_paragraph = UnoParagraph(
+        text="This paragraph comes after the code block."
+    )
+
+    callout.obj_ref.value.children.append(nested_code_block.obj_ref)  # pyright: ignore[reportUnknownMemberType]
+    callout.obj_ref.value.children.append(nested_paragraph.obj_ref)  # pyright: ignore[reportUnknownMemberType]
+
+    expected_objects: list[NotionObject[Any]] = [callout]
+    _assert_rst_converts_to_notion_objects(
+        rst_content=rst_content,
+        expected_objects=expected_objects,
+        make_app=make_app,
+        tmp_path=tmp_path,
+    )
+
+
 def test_nested_bullet_list(
     make_app: Callable[..., SphinxTestApp],
     tmp_path: Path,