Repository navigation
text: Keep inline HTML mark highlights in Markdown - #3425
Conversation
Pair <mark> the same way as other inline HTML tags and reuse the block-path color rules so default, color, and style highlights render. Co-authored-by: Henrik Øgård <henrikogaard@users.noreply.github.com>
Co-authored-by: Henrik Øgård <henrikogaard@users.noreply.github.com>
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: d04acc26c4
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| if let (Some(key), Some(value)) = (parts.next(), parts.next()) | ||
| && key.trim().eq_ignore_ascii_case("background-color") | ||
| { | ||
| return parse_mark_color(value.trim()); |
There was a problem hiding this comment.
Preserve the last background-color declaration
When an existing HTML <mark> has repeated declarations, such as style="background-color:red;background-color:blue", this early return selects red. Before this refactor, style_attrs inserted every declaration into a HashMap, so the later declaration overwrote the earlier one, matching inline-style cascade; this therefore changes existing block-HTML rendering, and an invalid first declaration also prevents a later valid fallback. Scan the full declaration list and retain the last applicable color instead.
AGENTS.md reference: AGENTS.md:L124-L125
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Agreed — the old HashMap path kept the last background-color string and then parsed it. style_background_color now scans the full list the same way, so a later valid declaration wins and an invalid last value still fails instead of falling back to an earlier one.
Scan the full style list and parse the last background-color, matching the old HashMap cascade so an earlier declaration no longer wins. Co-authored-by: Henrik Øgård <henrikogaard@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Thanks for the PR! I pushed a small follow-up commit:
|
## Description Prepare v0.7.2 on `stable` from the PRs merged into `main` since v0.7.1, leaving out every change that breaks existing consumers. `stable` already carries #3371 and #3373; this adds the remaining compatible PRs with `git cherry-pick -x` and bumps the workspace to 0.7.2. ### Included - kit: Add optional gpui-fast backend (#3375) - tooltip: Make show delay and grace period configurable with `TooltipDefaults` (#3376) - docs: Explain recovering focus when the focused element stops rendering (#3386) - diff: Add readonly patch viewer (#3378) - kit: Use one Windows manifest with GPUI Fast (#3380) - test: Make Progress and TitleBar findable in UI tests (#3383) - input: Preserve selection, focus ring and context menu actions (#3382) - diff: Add a Git history example and complete review APIs (#3388) - text_view: Ignore gestures that stay inside one block plugin (#3390) - text_view: Round the first and last table rows to the frame radius (#3309) - menu: Open a context menu with a long press on touch (#3393) - text_view: Keep narrow table columns on one line (#3399) - settings: Keep focus rings inside the list viewport (#3394) - scrollable_mask: Keep rounded scroll-table corners clean at any scroll offset (#3400) - dialog: Add margin_top to AlertDialog (#3404) - input: Add InputState::add_selection for programmatic multi-cursor (#3403) - text_selection: Stop writing selection state on every frame (#3407) - table: Make the sort icon a labelled button (#3396) - table: Report visible row ranges of one row or none (#3397) - dialog: Support configurable entrance animations (#3405) - docs: Explain the open_dialog builder and footer contracts (#3406) - dock: Hand the focus to the tab that replaces a closed one (#3409) - dropdown_button: Add A11y names for the menu trigger (#3410) - text, resizable: Stop notifying state that did not change (#3418) - editor: Add on-demand completion commands (#3411) - table: Clear a right-clicked cell's outline on the next click (#3413) - tab: Scroll a clicked tab into view with the next one peeking (#3419) - table: Allow a header row height separate from the body (#3420) - menu: Focus a context menu before its first frame (#3422) - text: Preserve logical selection across presentation changes (#3421) - text: Keep inline HTML mark highlights in Markdown (#3425) - input: Anchor completion/code-action popups to the current frame's caret (#3412) - input: Run custom context menu builders after releasing the input (#3433) - input: Keep auto-grow rows fitted when the limits change (#3430) - text: Paint TextView selection under the glyphs (#3439) Already on `stable`: #3371, #3373. ### Excluded (Breaking Changes) - #3432 motion: `Easing::sample` now returns values outside `[0, 1]` for overshooting curves. - #3415 tab: new `TabVariant::Folder` breaks exhaustive matches. - #3402 kit: pointer helpers now keep held modifiers; nested context-menu behavior changes in tests. - #3384 test: `TestWindowExt` gains required methods. - #3302 resizable: `ResizeHandle::on_drag` takes `&T` instead of `Rc<T>`. - #3389, #3395, #3398 webview: wrapper API changes, `gpui-wry` → `gpui-webview` rename, and the GPUI Fast requirement. #3411, #3405 and #3396 have a Breaking Changes section that reads "None" and are included. #3376 only deprecates `TooltipRequest::placement`, and #3397 / #3382 change behavior compatibly, so they are included too. ### Adaptations - `crates/kit/tests/collections.rs` and `crates/kit/tests/rendering.rs`: conflict resolutions drop the tests that belong to #3402 and keep each backported PR's own test. - `test: Keep backported tests on the v0.7.1 test API`: the menu and completion tests from #3422 and #3412 used `find_all` and `pointer_down`/`pointer_up` from #3384/#3402. They now query `gpui_kit::base::test_support::snapshots` and dispatch mouse events directly. - `kit: Prepare v0.7.2`: workspace version bump; `Cargo.lock` only updates workspace members. ## Public API No new public API beyond what the included PRs add; each lists its items in its own `## Public API` section (notably #3375, #3376, #3378, #3388, #3403, #3404, #3405, #3411, #3420). ## How to Test - `cargo clippy --workspace --all-targets -- --deny warnings` passes on Linux. - `cargo test -p gpui-kit --features "test-support component assets" --test collections --test menu --test input` passes on Linux. - The macOS-only `rendering` test (#3439 adds one case, the count is updated to 11) was not run. AI-assisted: the backport, conflict resolution and test adaptations were done with Claude Code. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Floyd Wang <codelife721@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Gustave <gustavel@gmail.com> Co-authored-by: luren <84951845+lurenjia534@users.noreply.github.com> Co-authored-by: Ylin <ylinwind@gmail.com> Co-authored-by: ihavecoke <mixboip@gmail.com> Co-authored-by: Lorenzo <150276837+Bombatomica64@users.noreply.github.com> Co-authored-by: MR. XIE <113512030+xxww0098@users.noreply.github.com> Co-authored-by: xxww0098 <shefkie1957@gmail.com> Co-authored-by: Sola 🌙🤖 <266175376+sola-ryu@users.noreply.github.com> Co-authored-by: Sola <sola-ryu@users.noreply.github.com> Co-authored-by: Andy Hsu <i@nn.ci> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Floyd Wang <gassnake999@gmail.com> Co-authored-by: Daiki Tomioka <20753105+TomiXRM@users.noreply.github.com> Co-authored-by: Henrik Øgård <henrik@ogard.no> Co-authored-by: Henrik Øgård <henrikogaard@users.noreply.github.com> Co-authored-by: Endless <endless@longbridge.com> Co-authored-by: John Costa <costajohnt@gmail.com> Co-authored-by: Alexander <87220898+sneffets@users.noreply.github.com> Co-authored-by: Cesar Talén <154442565+cesartalen@users.noreply.github.com>
Closes #3423
Description
Inline
<mark>tags inside a Markdown paragraph were dropped. CommonMark hands each raw tag over as its own HTML sibling, andinline_html_markonly knewstrong/b/em/i/u/s/del/strike, so<mark>never paired and the text rendered without a highlight.colorandstyle="background-color: …"were ignored.This pairs
<mark>like the other inline formatting tags, passes the opening tag's attributes through, and reuses the block HTML color rules (colorfirst, thenstyle="background-color", then the default#fef08a).Screenshot
From Rísta, which uses
TextViewmarkdown preview. The left pane is the source editor; the right pane is the preview. The note has plain==highlighted==(emitted as bare<mark>) and six colored highlights (emitted as<mark color="#rrggbbaa">).After, light theme:
How to Test
Unit tests:
cargo test -p gpui-base --lib -- text::format::markdown text::format::html cargo fmt -p gpui-base -- --check cargo clippy -p gpui-base --lib --tests -- --deny warningsAll three passed on this branch (73 format tests).
Rísta check: open a note with
==highlighted==and colored==🔴text==highlights. The preview should show the default yellow mark and the colored washes, in both dark and light themes.Checklist
cargo runfor story tests related to the changes.