Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable25] Combined code block backport #3480

Merged
merged 3 commits into from
Nov 24, 2022
Merged

Conversation

juliusknorr
Copy link
Member

@juliusknorr juliusknorr commented Nov 24, 2022

📝 Summary

🏁 Checklist

  • Code is properly formatted (npm run lint / npm run stylelint / composer run cs:check)
  • Sign-off message is added to all commits
  • Tests (unit, integration and/or end-to-end) passing and the changes are covered with tests
  • Documentation (README or documentation) has been updated or is not required

susnux and others added 2 commits November 24, 2022 10:35
`prosemirror-markdown` uses `params` attribute for the language hint
whereas `tiptap` uses the `language` attribute.

Signed-off-by: Ferdinand Thiessen <[email protected]>
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 <[email protected]>
@juliusknorr juliusknorr added bug Something isn't working 3. to review labels Nov 24, 2022
@juliusknorr juliusknorr added this to the Nextcloud 25.0.2 milestone Nov 24, 2022
@blizzz blizzz mentioned this pull request Nov 24, 2022
1 task
@cypress
Copy link

cypress bot commented Nov 24, 2022



Test summary

97 0 0 0Flakiness 2


Run details

Project Text
Status Passed
Commit f772b34 ℹ️
Started Nov 24, 2022 1:19 PM
Ended Nov 24, 2022 1:25 PM
Duration 06:05 💡
OS Linux Ubuntu - 20.04
Browser Electron 106

View run in Cypress Dashboard ➡️


Flakiness

sections.spec.js Flakiness
1 Content Sections > Heading anchors > Anchor scrolls into view
links.spec.js Flakiness
1 test link marks > link preview > shows a link preview

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

Copy link
Member

@marcelklehr marcelklehr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

@juliusknorr
Copy link
Member Author

/compile

Signed-off-by: nextcloud-command <[email protected]>
@juliusknorr juliusknorr merged commit 64a168b into stable25 Nov 24, 2022
@delete-merged-branch delete-merged-branch bot deleted the backport/3330/stable25 branch November 24, 2022 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants