Cherry pick mermaid fix 2#58422
Merged
Merged
Conversation
Following up on #57644 by @cameron1024, this PR updates `merman` to v0.6. With merman 0.6's new raster-safe SVG pipeline, Zed can move generic `usvg`/`resvg` cleanup passes out of this crate and rely on merman for them instead. **What's moved to merman:** - `foreignObject` fallback text generation - Unsupported CSS cleanup - Invalid SVG attribute cleanup **What's kept in Zed:** - Theme CSS injection and accent color assignment - Zed-specific fallback overlay handling **Integration note:** In merman v0.6, fallback overlay groups are marked with `data-merman-foreignobject="fallback"` and preserve source classes like `node` or `section-*`, so host CSS can still style fallback text. This PR updates Zed's accent tracker to check for this marker, ensuring fallback overlays are not treated as real layout nodes. I also added a render-stage test for the new contract: the SVG output from `render_mermaid` is already raster-safe before Zed-specific post-processing runs. --- ### Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ### Release Notes: - Improved rendering of Mermaid diagrams in Markdown previews. ### Tests: - `cargo +1.95 fmt --check -p mermaid_render` - `cargo +1.95 test -p mermaid_render` - `cargo +1.95 clippy -p mermaid_render --all-targets -- -D warnings` - `git diff --check HEAD~1..HEAD` --------- Co-authored-by: cameron <cameron.studdstreet@gmail.com>
Member
|
@zed-industries/approved |
This was referenced Jun 3, 2026
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.
Cherry-picks 2 PRs - originally meant to be 1 PR, but my local git state was messed up, causing a
git pushto fail and I didn't notice:Self-Review Checklist:
Closes #ISSUE
Release Notes: