Optimize raw HTML post-processor #1510
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Using a set allows for better performances when checking for membership of a tag within block level elements. Issue-1507: Python-Markdown#1507
Previously, the raw HTML post-processor would precompute all possible replacements for placeholders in a string, based on the HTML stash. It would then apply a regular expression substitution using these replacements. Finally, if the text changed, it would recurse, and do all that again. This was inefficient because placeholders were re-computed each time it recursed, and because only a few replacements would be used anyway. This change moves the recursion into the regular expression substitution, so that: 1. the regular expression does minimal work on the text (contrary to re-scanning text already scanned in previous frames); 2. but more importantly, replacements aren't computed ahead of time anymore (and even less *several times*), and only fetched from the HTML stash as placeholders are found in the text. The substitution function relies on the regular expression groups ordering: we make sure to match `<p>PLACEHOLDER</p>` first, before `PLACEHOLDER`. The presence of a wrapping `p` tag indicates whether to wrap again the substitution result, or not (also depending on whether the substituted HTML is a block-level tag). Issue-1507: Python-Markdown#1507
pawamoy
force-pushed
the
optimize-rawhtml-postprocessor
branch
from
6113aad to
fc9acc0
Compare
|
Hmm, the list->set change could be seen as breaking. We can instead create a new |
This comment was marked as resolved.
This comment was marked as resolved.
pawamoy
commented
Feb 22, 2025
| else: | ||
| key = m.group(2) | ||
| wrapped = False | ||
| if (key := int(key)) >= len(self.md.htmlStash.rawHtmlBlocks): |
There was a problem hiding this comment.
Could use html_counter instead:
Suggested change
| if (key := int(key)) >= len(self.md.htmlStash.rawHtmlBlocks): | |
| if (key := int(key)) >= self.md.htmlStash.html_counter: |
| return pattern.sub(substitute_match, html) | ||
| return pattern.sub(substitute_match, f"<p>{html}</p>") | ||
|
|
||
| if self.md.htmlStash.html_counter: |
There was a problem hiding this comment.
Or we could not use html_counter and only rely on the actual list, rawHtmlBlocks:
Suggested change
| if self.md.htmlStash.html_counter: | |
| if self.md.htmlStash.rawHtmlBlocks: |
pawamoy
commented
Feb 23, 2025
| if (key := int(key)) >= len(self.md.htmlStash.rawHtmlBlocks): | ||
| return m.group(0) | ||
| html = self.stash_to_string(self.md.htmlStash.rawHtmlBlocks[key]) | ||
| if self.isblocklevel(html) or not wrapped: |
There was a problem hiding this comment.
Micro-optimization (given the list->set change is applied): make isblocklevel check lazy.
Suggested change
| if self.isblocklevel(html) or not wrapped: | |
| if not wrapped or self.isblocklevel(html): |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1507