Fix shortcode handling in code-fences #1720
Merged
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
|
Can you add tests? It will need quite a few |
Sure, I will add some tests. |
liushuyu
force-pushed
the
fix-shortcode-codefence
branch
from
3d6e131
to
fcf072f
Compare
|
Rebased. Code cleaned-up. Tests added. |
|
This is basically a hack, but I think this is also the minimal changes required for fixing this issue. There are three tests added to test the rendering behavior including a |
liushuyu
force-pushed
the
fix-shortcode-codefence
branch
from
fcf072f
to
1db2bab
Compare
|
Is this good to merge? Or should I do something more than this? |
Keats
approved these changes
Jan 13, 2022
| @@ -242,7 +242,32 @@ pub fn markdown_to_html( | |||
| match event { | |||
| Event::Text(text) => { | |||
| if let Some(ref mut code_block) = code_block { | |||
| let html = code_block.highlight(&text); | |||
| let html; | |||
| if contains_shortcode(text.as_ref()) { | |||
There was a problem hiding this comment.
very small style neat but let html = if { .. } else { .. } is a bit nicer imo
Keats
pushed a commit
that referenced
this pull request
Jan 22, 2022
* rendering/markdown: fix shortcode handling in codefences * rendering/tests: add a bunch of tests for codefence + shortcode usages
Keats
pushed a commit
that referenced
this pull request
Jan 23, 2022
* rendering/markdown: fix shortcode handling in codefences * rendering/tests: add a bunch of tests for codefence + shortcode usages
thomasantony
pushed a commit
to thomasantony/zola
that referenced
this pull request
Sep 17, 2022
* rendering/markdown: fix shortcode handling in codefences * rendering/tests: add a bunch of tests for codefence + shortcode usages
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.
IMPORTANT: Please do not create a Pull Request adding a new feature without discussing it first.
The place to discuss new features is the forum: https://zola.discourse.group/
If you want to add a new feature, please open a thread there first in the feature requests section.
Sanity check:
Code changes
(Delete or ignore this section for documentation changes)
nextbranch?If the change is a new feature or adding to/changing an existing one:
This should fix #1708.
The fix is actually a workaround: by applying and capturing shortcode rendering output and then re-render them inside the code-fence context.