amanuensis/parser/parsing.py

@@ -65,8 +65,12 @@ def parse_paired_formatting(
     handlers[next_cite] = lambda: parse_citation(
         text, in_bold=in_bold, in_italic=in_italic
     )
-    handlers[next_bold] = lambda: parse_bold(text, in_cite=in_cite, in_italic=in_italic)
+    handlers[next_bold] = lambda: parse_bold(
-    handlers[next_italic] = lambda: parse_italic(text, in_cite=in_cite, in_bold=in_bold)
+        text, in_cite=in_cite, in_italic=in_italic
+    )
+    handlers[next_italic] = lambda: parse_italic(
+        text, in_cite=in_cite, in_bold=in_bold
+    )
     # Map the next parsing step at -1. If we're currently inside a formatting
     # mark pair, skip parsing line breaks, which are not allowed inside paired
     # marks.

tests/test_parser.py

@@ -25,18 +25,18 @@ from amanuensis.parser.parsing import (
 
 def assert_types(spans: Spans, types: Sequence, loc=None):
     """
-    Asserts that a span list has the types specified.
+    Asserts that  a span list has the types specified.
     Each element in `types` should be either a span type or a list. The first
     element of the list is the container type and the remaining elements are the
     content types.
     """
-    for i in range(max(len(spans), len(types))):
+    assert len(spans) == len(
+        types
+    ), f"Unexpected type sequence length at loc {loc if loc else 'root'}"
+    i = -1
+    for span, span_type in zip(spans, types):
+        i += 1
         i_loc = f"{loc}.{i}" if loc else f"{i}"
-        # Check lengths are equal
-        assert i < len(spans), f"Span list unexpectedly short at {i_loc}"
-        assert i < len(types), f"Type list unexpectedly short at {i_loc}"
-        # Check types are equal
-        span, span_type = spans[i], types[i]
         if isinstance(span_type, list):
             assert isinstance(
                 span, SpanContainer
@@ -317,147 +317,3 @@ def test_parse_citation_nested():
     assert_text(spans, [["**hello world"], "**"])
     citation: CitationSpan = spans[0]
     assert citation.cite_target == "**hello world"
-
-
-def test_parse_paragraphs():
-    """Test parsing paragraphs"""
-    para: str
-    span: SpanContainer
-
-    # Body paragraph
-    para = "\tIn the beginning was the Word."
-    span = parse_paragraph(para)
-    assert_types([span], [[BodyParagraph, TextSpan]])
-    assert_text([span], [["In the beginning was the Word."]])
-
-    # Signature paragraph
-    para = "~Ersatz Scrivener, scholar extraordinaire"
-    span = parse_paragraph(para)
-    assert_types([span], [[SignatureParagraph, TextSpan]])
-    assert_text([span], [["Ersatz Scrivener, scholar extraordinaire"]])
-
-
-def test_parse_article():
-    """Test the full article parser"""
-    article: str = (
-        "Writing a **unit test** requires having test //content//.\n\n"
-        "This content, of course, must be [[created|Writing test collateral]].\n\n"
-        "~Bucky\\\\\nUnit test writer"
-    )
-    parsed: ParsedArticle = parse_raw_markdown(article)
-
-    assert_types(
-        [parsed],
-        [
-            [
-                ParsedArticle,
-                [
-                    BodyParagraph,
-                    TextSpan,
-                    [BoldSpan, TextSpan],
-                    TextSpan,
-                    [ItalicSpan, TextSpan],
-                    TextSpan,
-                ],
-                [BodyParagraph, TextSpan, [CitationSpan, TextSpan], TextSpan],
-                [SignatureParagraph, TextSpan, LineBreak, TextSpan],
-            ]
-        ],
-    )
-    assert_text(
-        [parsed],
-        [
-            [
-                [
-                    "Writing a ",
-                    ["unit test"],
-                    " requires having test ",
-                    ["content"],
-                    ".",
-                ],
-                ["This content, of course, must be ", ["created"], "."],
-                ["Bucky", None, "Unit test writer"],
-            ]
-        ],
-    )
-
-
-def test_visitor():
-    """Test that a visitor dispatches to hooks correctly"""
-
-    class TestVisitor(RenderableVisitor):
-        def __init__(self):
-            self.visited = []
-
-        def TextSpan(self, span: TextSpan):
-            assert isinstance(span, TextSpan)
-            self.visited.append(span)
-
-        def LineBreak(self, span: LineBreak):
-            assert isinstance(span, LineBreak)
-            self.visited.append(span)
-
-        def ParsedArticle(self, span: ParsedArticle):
-            assert isinstance(span, ParsedArticle)
-            self.visited.append(span)
-            span.recurse(self)
-
-        def BodyParagraph(self, span: BodyParagraph):
-            assert isinstance(span, BodyParagraph)
-            self.visited.append(span)
-            span.recurse(self)
-
-        def SignatureParagraph(self, span: SignatureParagraph):
-            assert isinstance(span, SignatureParagraph)
-            self.visited.append(span)
-            span.recurse(self)
-
-        def BoldSpan(self, span: BoldSpan):
-            assert isinstance(span, BoldSpan)
-            self.visited.append(span)
-            span.recurse(self)
-
-        def ItalicSpan(self, span: ItalicSpan):
-            assert isinstance(span, ItalicSpan)
-            self.visited.append(span)
-            span.recurse(self)
-
-        def CitationSpan(self, span: CitationSpan):
-            assert isinstance(span, CitationSpan)
-            self.visited.append(span)
-            span.recurse(self)
-
-    article: str = (
-        "Writing a **unit test** requires having test //content//.\n\n"
-        "This content, of course, must be [[created|Writing test collateral]].\n\n"
-        "~Bucky\\\\\nUnit test writer"
-    )
-    parsed: ParsedArticle = parse_raw_markdown(article)
-
-    visitor = TestVisitor()
-    # All the typecheck asserts pass
-    parsed.render(visitor)
-    # The test article should parse into these spans and visit in this (arbitrary) order
-    type_order = [
-        ParsedArticle,
-        BodyParagraph,
-        TextSpan,
-        BoldSpan,
-        TextSpan,
-        TextSpan,
-        ItalicSpan,
-        TextSpan,
-        TextSpan,
-        BodyParagraph,
-        TextSpan,
-        CitationSpan,
-        TextSpan,
-        TextSpan,
-        SignatureParagraph,
-        TextSpan,
-        LineBreak,
-        TextSpan,
-    ]
-    assert len(visitor.visited) == len(type_order)
-    for span, type in zip(visitor.visited, type_order):
-        assert isinstance(span, type)