Prevent spans crossing line boundaries in class-based code block formatter #2237
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
|
Thanks. Can you add some test that would fail before this change? |
TheOnlyMrCat
force-pushed
the
line-by-line
branch
from
a493573 to
3955852
Compare
|
I've added two snapshot tests for cases that would have exhibited incorrect behaviour (and extended |
|
Thanks that looks good! |
peterprototypes
pushed a commit
to peterprototypes/zola
that referenced
this pull request
Sep 12, 2023
…atter (getzola#2237) * Prevent spans crossing line boundaries in class formatter * Add snapshot tests for classed highlighting
technimad
pushed a commit
to technimad/zola
that referenced
this pull request
Sep 30, 2023
…atter (getzola#2237) * Prevent spans crossing line boundaries in class formatter * Add snapshot tests for classed highlighting
Keats
pushed a commit
that referenced
this pull request
Dec 18, 2023
…atter (#2237) * Prevent spans crossing line boundaries in class formatter * Add snapshot tests for classed highlighting
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.
The class-based code block formatter has bad interactions with other line-based highlighting effects (
linenos,hl_lines) because the spans it generates cross multiple lines. This patch copies thescope_to_classesfunction from syntect and uses it to make each line independent of one another when using class-based highlighting.The
SyntaxHighlighter::finalizemethod has also been removed in this patch, as it has been rendered unnecessary.This greatly increases the number of
<span>tags generated by the formatter, even in code blocks that don't make use of line-based highlighting effects. I would be happy to implement a mechanism to only split the spans when it would otherwise cause problems, and keep the previous nesting behaviour elsewhere.Fixes #1942