[stable25] Combined code block backport#3480
Merged
juliusknorr merged 3 commits intostable25from Nov 24, 2022
Merged
Conversation
`prosemirror-markdown` uses `params` attribute for the language hint whereas `tiptap` uses the `language` attribute. Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
Markdown-it serialized code blocks to `<pre><code>...\n</pre></code>`, which leads to trailing newlines in the code blocks as rendered by Tiptap. Let the Tiptap CodeBlock node remove the trailing newline in parseHTML in order to avoid this. There's another issue with trailing newlines that got added to code blocks on purpose being removed by prosemirror-markdown, but that's not affected by this change. Fixes: #2344 Signed-off-by: Jonas <jonas@freesources.org>
Test summaryRun details
View run in Cypress Dashboard ➡️ Flakiness
This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard |
||||||||||||||||||||||||||||||||||
Member
Author
|
/compile |
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
This file contains hidden or 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
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.
📝 Summary
🏁 Checklist
npm run lint/npm run stylelint/composer run cs:check)