umputun / revdiff

90%

master: 90%

LAST BUILD ON BRANCH fix-prefix-fg-on-highlighted-lines

branch: fix-prefix-fg-on-highlighted-lines

CHANGE BRANCH

x

Reset

Sync Branches

• fix-prefix-fg-on-highlighted-lines
• 258-fix-auto-scroll
• add-collapsed-flag
• agent/filter-unreviewed-files
• agterm-overlay-backend
• all-files-mode
• annotation-list-popup
• annotation-rowcache
• auto-light-dark-theme
• ci-shellcheck-yaml
• code-smells-cleanup
• codex-plugin
• collapsed-diff-mode
• commit-info-popup
• community-themes
• compact-diff-mode
• compact-improve
• compare-flag
• custom-keybindings
• daulet/new_file
• daulet/word_highlight
• dependabot/github_actions/actions/checkout-7
• dependabot/github_actions/actions/setup-go-7
• dependabot/go_modules/github.com/alecthomas/chroma/v2-2.24.1
• dependabot/go_modules/github.com/alecthomas/chroma/v2-2.25.0
• dependabot/go_modules/github.com/alecthomas/chroma/v2-2.26.1
• dependabot/go_modules/github.com/alecthomas/chroma/v2-2.27.0
• dependabot/go_modules/github.com/charmbracelet/x/ansi-0.11.7
• dependabot/go_modules/github.com/mattn/go-runewidth-0.0.23
• dependabot/go_modules/github.com/mattn/go-runewidth-0.0.24
• dependabot/go_modules/github.com/mattn/go-runewidth-0.0.27
• diff-search
• discard-quit
• docs/pi-package-review-fixes
• docs/skills-drop-binary-presence-check
• eager-commit-fetch
• exit-code-on-annotations
• external-editor-annotations
• feat/add-flake-nix
• feat/agent-deck-window-backend
• feat/annotation-marker
• feat/cmux-support
• feat/codex-plan-review-hook
• feat/compact-preserve-position
• feat/file-jump-picker
• feat/herdr-backend
• feat/history-skill-fallback
• feat/jj-support
• feat/launch-script-improvements
• feat/navigation-scrollbar
• feat/one-light-chroma-style
• feat/open-editor-keymap
• feat/opencode-config-docs
• feat/overlay-mouse-support
• feat/post-flush-hook
• feat/preload-annotations
• feat/relay-overlay-stderr
• feat/review-info-overlay
• feat/reviewed-diff-fingerprints
• feat/reviewed-files-and-status-indicators
• feat/scroll-indicators
• feat/scrollbar-thumb
• feat/stdin-scratch-buffer
• feat/tmux-detached-session-backend
• feat/toggle-tree-pane
• feat/tree-focus-diff-scroll
• feat/untracked-flag
• feat/wheel-scroll-viewport-only
• feat/word-diff-highlighting
• feat/word-diff-opt-in
• feat/zed-revdiff-task
• feature/annotation-navigation
• feature/binary-file-detection
• feature/layout-agnostic-keys
• feature/layout-agnostic-keys-v2
• feature/new-file-and-untracked-support
• feature/range-hunk-annotations
• fix-ctrl-du-half-page
• fix-file-annotation-bugs
• fix-initial-loading-flash
• fix-marketplace-name-in-docs
• fix-tmux-title-compat
• fix-tree-wheel-single-step
• fix-wheel-scroll-coalesce
• fix-wrap-right-padding
• fix/124-page-cursor-relative-position
• fix/agterm-overlay
• fix/agterm-plan-review
• fix/center-hunk-in-viewport
• fix/cmux-close-surface-recycled-ref
• fix/cmux-ghostty-detection
• fix/cmux-send-stdout-leak
• fix/diff-viewport-visual-height-scroll
• fix/ghostty-improvements
• fix/headless-tmux-window-fallback
• fix/issue-203-zellij-popup-size
• fix/kitty-ssh-remote-launch
• fix/launcher-argument-quoting
• fix/only-dot-prefix
• fix/overlay-path-inheritance
• fix/pagedown-freeze-annotated-last-line
• fix/pi-revdiff-review-trigger
• fix/revdiff-skill-timeout-recovery
• fix/staged-only-empty-diff
• fix/subdirectory-support
• fix/theme-persist-ini-section
• fix/tmux-theme-detection
• fix/untracked-renames
• fix/zellij-plan-review-pane-size
• global-hunk-navigation
• hunk-keyword-expansion
• in-session-annotation-flush
• include-filter
• intraline-word-diff
• iterm2-osascript
• launcher-override-chain
• leader-chord-keybindings
• line-numbers
• markdown-toc-navigation
• master
• mercurial-support
• mouse-support
• move-code-to-app
• only-filter
• open-focused-file-editor
• overlay-extraction
• perf/annotation-blink-rerender
• perf/page-scroll-navigation
• perf/per-line-render-cache
• perf/trackpad-wheel-frame-coalescing
• pi-revdiff-claude-workflow
• rebind-file-picker-key
• refs/tags/v0.1.0
• refs/tags/v0.1.1
• refs/tags/v0.10.0
• refs/tags/v0.11.0
• refs/tags/v0.12.0
• refs/tags/v0.13.0
• refs/tags/v0.14.0
• refs/tags/v0.14.1
• refs/tags/v0.15.0
• refs/tags/v0.15.1
• refs/tags/v0.15.2
• refs/tags/v0.15.3
• refs/tags/v0.16.0
• refs/tags/v0.16.1
• refs/tags/v0.17.0
• refs/tags/v0.18.0
• refs/tags/v0.18.1
• refs/tags/v0.19.0
• refs/tags/v0.19.1
• refs/tags/v0.19.2
• refs/tags/v0.2.0
• refs/tags/v0.2.1
• refs/tags/v0.2.2
• refs/tags/v0.2.3
• refs/tags/v0.2.4
• refs/tags/v0.20.0
• refs/tags/v0.21.0
• refs/tags/v0.22.0
• refs/tags/v0.23.0
• refs/tags/v0.24.0
• refs/tags/v0.25.0
• refs/tags/v0.25.1
• refs/tags/v0.26.0
• refs/tags/v0.26.1
• refs/tags/v0.27.0
• refs/tags/v0.27.1
• refs/tags/v0.28.0
• refs/tags/v0.3.0
• refs/tags/v0.4.0
• refs/tags/v0.4.1
• refs/tags/v0.4.2
• refs/tags/v0.5.0
• refs/tags/v0.6.0
• refs/tags/v0.7.0
• refs/tags/v0.7.1
• refs/tags/v0.7.2
• refs/tags/v0.8.0
• refs/tags/v0.9.0
• refs/tags/v1.0.0
• refs/tags/v1.1.0
• refs/tags/v1.1.1
• refs/tags/v1.10.0
• refs/tags/v1.11.0
• refs/tags/v1.2.0
• refs/tags/v1.2.1
• refs/tags/v1.3.0
• refs/tags/v1.4.0
• refs/tags/v1.4.1
• refs/tags/v1.5.0
• refs/tags/v1.5.1
• refs/tags/v1.6.0
• refs/tags/v1.6.1
• refs/tags/v1.7.0
• refs/tags/v1.7.1
• refs/tags/v1.8.0
• refs/tags/v1.9.0
• refs/tags/v1.9.1
• reload
• rename-aware-diffs
• revert/197-opencode-symlink
• revert/opencode-setup-symlink
• review-findings
• review-history
• search-history
• shell-completions
• sidepane-extraction
• signal-safe-annotation-save
• single-column-line-numbers-full-context
• single-file-mode
• skill-opencode-timeout-fix
• skill-scripts-hg-jj
• skill-use-claude-skill-dir
• status-bar-line-number
• status-line-help-overlay
• structural-refactor
• style-extraction
• theme-support
• two-ref-diff
• ui-package-split
• update-pi-extension-agent-tool
• vim-motion-preset
• widen-annot-list-popup
• word-wrap
• worddiff-extraction
• worktree-bugfix
• worktree-no-git-file-review
• wrap-marker-style

Build # 25134989303

Build Type

Pull #160

github

Committed by umputun

Commit Message

fix(ui): use search-match fg for prefix on collapsed search-match lines

Addresses Copilot's review on PR #160. When a line in collapsed mode is a
search match and chroma highlighting is on, the previous fix wrapped the
+/~ prefix in the add-fg or modify-fg color, mismatching the search-match
background. The non-highlighted path uses the SearchMatch lipgloss style
(fg + bg), so the prefix renders in search-fg there. With highlighting on,
the lipgloss style drops the foreground for chroma to own content fg, so
the prefix wrap must inject search-fg explicitly to match.

Add ColorKeySearchFg (mirrors the existing ColorKeyAddLineFg / ModifyLineFg
pattern) and use it in renderCollapsedAddLine when isSearchMatch is true.

Pull Request Pull Request #160: fix(ui): theme rendering bugs surfaced by colorblind-light

Coverage Stats

36 of 49 new or added lines in 6 files covered. (73.47%)

80 existing lines in 6 files now uncovered.

9346 of 10433 relevant lines covered (89.58%)

515.66 hits per line