diff --git a/markdown_it/rules_block/html_block.py b/markdown_it/rules_block/html_block.py index fe7e464e..c147794c 100644 --- a/markdown_it/rules_block/html_block.py +++ b/markdown_it/rules_block/html_block.py @@ -31,6 +31,16 @@ ] +def html_block_starts(state: StateBlock, line: int) -> bool: + """Whether `line` begins an HTML block of any type (issue #434).""" + pos = state.bMarks[line] + state.tShift[line] + maximum = state.eMarks[line] + if pos >= maximum or state.src[pos] != "<": + return False + lineText = state.src[pos:maximum] + return any(sequence[0].search(lineText) for sequence in HTML_SEQUENCES) + + def html_block(state: StateBlock, startLine: int, endLine: int, silent: bool) -> bool: LOGGER.debug( "entering html_block: %s, %s, %s, %s", state, startLine, endLine, silent diff --git a/markdown_it/rules_block/paragraph.py b/markdown_it/rules_block/paragraph.py index d27b07b1..6b540e40 100644 --- a/markdown_it/rules_block/paragraph.py +++ b/markdown_it/rules_block/paragraph.py @@ -3,6 +3,7 @@ import logging from ..common.utils import mdTrim +from .html_block import html_block_starts from .state_block import StateBlock LOGGER = logging.getLogger(__name__) @@ -36,6 +37,16 @@ def paragraph(state: StateBlock, startLine: int, endLine: int, silent: bool) -> nextLine += 1 continue + # An HTML block start on a line under-indented for the current + # container is not a lazy continuation: like cmark, end the paragraph + # here so the line can open a block in an outer container (issue + # #434). At the same container level a type-7 sequence still does not + # interrupt the paragraph, which the terminator rules below handle. + if state.sCount[nextLine] < state.blkIndent and html_block_starts( + state, nextLine + ): + break + # Some tags can terminate paragraph without empty line. terminate = False for terminatorRule in terminatorRules: diff --git a/tests/test_html_block_list.py b/tests/test_html_block_list.py new file mode 100644 index 00000000..66761d7d --- /dev/null +++ b/tests/test_html_block_list.py @@ -0,0 +1,34 @@ +"""Regression tests for HTML blocks interacting with list items (#434).""" + +import pytest + +from markdown_it import MarkdownIt + + +@pytest.fixture +def md() -> MarkdownIt: + return MarkdownIt("commonmark", {"html": True}) + + +def test_html_block_under_indented_closes_list(md: MarkdownIt) -> None: + """A type-7 HTML block at outer indentation ends the list, like cmark.""" + assert md.render("## Opts\n\n- a\n
\n## Next\n") == ( + "

Opts

\n\n
\n## Next\n" + ) + + +def test_html_block_at_item_indent_is_lazy_continuation(md: MarkdownIt) -> None: + """At the item's content indent, type 7 cannot interrupt the paragraph.""" + assert md.render("- a\n
\n") == "\n" + + +def test_html_block_cannot_interrupt_top_level_paragraph(md: MarkdownIt) -> None: + assert md.render("para\n
\n") == "

para\n

\n" + + +def test_plain_text_is_still_lazy_continuation(md: MarkdownIt) -> None: + assert md.render("- a\nb\n") == "\n" + + +def test_type_6_html_block_closes_list(md: MarkdownIt) -> None: + assert md.render("- a\n
\n") == "\n
\n"