Commit f2b9fd1

facelessusermitya57

and

authored

Ensure md_in_html does not drop content

Fixes #1526. Co-authored-by: Dmitry Shachnev <mitya57@users.noreply.github.com>

1 parent 513de8a commit f2b9fd1Copy full SHA for f2b9fd1

File tree

+32

-1

lines changed

+32

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),`
`9`	`9`	`and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).`
`10`	`10`	`See the [Contributing Guide](contributing.md) for details.`
`11`	`11`
	`12`	`+## [Unreleased]`
	`13`	`+`
	`14`	`+### Fixed`
	`15`	`+`
	`16`	+* Fixed dropped content in `md_in_html` (#1526).
	`17`	`+`
`12`	`18`	`## [3.8.0] - 2025年04月09日`
`13`	`19`
`14`	`20`	`### Changed`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -387,12 +387,16 @@ def run(self, parent: etree.Element, blocks: list[str]) -> bool:`
`387`	`387`	`element = self.parser.md.htmlStash.rawHtmlBlocks[index]`
`388`	`388`	`if isinstance(element, etree.Element):`
`389`	`389`	`# We have a matched element. Process it.`
`390`		`- blocks.pop(0)`
	`390`	`+ block=blocks.pop(0)`
`391`	`391`	`parent.append(element)`
`392`	`392`	`self.parse_element_content(element)`
`393`	`393`	`# Cleanup stash. Replace element with empty string to avoid confusing postprocessor.`
`394`	`394`	`self.parser.md.htmlStash.rawHtmlBlocks.pop(index)`
`395`	`395`	`self.parser.md.htmlStash.rawHtmlBlocks.insert(index, '')`
	`396`	`+ content = block[m.end(0):]`
	`397`	`+ # Ensure the rest of the content gets handled`
	`398`	`+ if content:`
	`399`	`+ blocks.insert(0, content)`
`396`	`400`	# Confirm the match to the `blockparser`.
`397`	`401`	`return True`
`398`	`402`	`# No match found.`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1517,6 +1517,27 @@ def test_md1_code_cdata(self):`
`1517`	`1517`	`extensions=['md_in_html']`
`1518`	`1518`	`)`
`1519`	`1519`
	`1520`	`+ def test_trailing_content_after_tag_in_md_block(self):`
	`1521`	`+`
	`1522`	+ # It should be noted that this is not the way `md_in_html` is intended to be used.
	`1523`	`+ # What we are specifically testing is an edge case where content was previously lost.`
	`1524`	`+ # Lost content should not happen.`
	`1525`	`+ self.assertMarkdownRenders(`
	`1526`	`+ self.dedent(`
	`1527`	`+ """`
	`1528`	`+ <div markdown>`
	`1529`	`+ <div class="circle"></div>AAAAA<div class="circle"></div>`
	`1530`	`+ </div>`
	`1531`	`+ """`
	`1532`	`+ ),`
	`1533`	`+ '<div>\n'`
	`1534`	`+ '<div class="circle"></div>\n'`
	`1535`	`+ '<p>AAAAA<div class="circle"></p>\n'`
	`1536`	`+ '</div>\n'`
	`1537`	`+ '</div>',`
	`1538`	`+ extensions=['md_in_html']`
	`1539`	`+ )`
	`1540`	`+`
`1520`	`1541`
`1521`	`1542`	`def load_tests(loader, tests, pattern):`
`1522`	`1543`	""" Ensure `TestHTMLBlocks` doesn't get run twice by excluding it here. """

Comments

(0)