Skip to content

Make the word highlighting colors follow the hunk rather than the line #2400

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.

Sign up for GitHub

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

Merged
Urgau merged 4 commits into from
May 11, 2026
+39 −34
Merged

Make the word highlighting colors follow the hunk rather than the line #2400

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8da446
Make the word colors highlighting follow the hunk rather than the line
Urgau May 9, 2026
1b0762d
Refactor CSS class of line and word highlighting
Urgau May 9, 2026
d153b16
Use orange for word added in a removed line
Urgau May 10, 2026
c1e90ea
Use stronger orange with black text
Urgau May 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 39 additions & 34 deletions src/gh_range_diff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,31 +265,31 @@ fn process_old_new(
.line-removed-after {{
color: rgb(220, 0, 0)
}}
.line-removed-after .word-added {{
color: black;
background-color: #FFA500;
}}
.line-added-after {{
color: rgb(0, 221, 0)
}}
.line-added-after .word-added {{
color: white;
background-color: rgb(0, 73, 0);
}}
.line-removed-before {{
color: rgb(192, 78, 76)
}}
.line-removed-before .word-removed {{
color: white;
background-color: rgb(192, 78, 76);
}}
.line-added-before {{
color: rgb(63, 128, 94)
}}
.word-removed-after {{
.line-added-before .word-removed {{
color: white;
background-color: rgb(220, 0, 0);
}}
.word-added-after {{
color: white;
background-color: rgb(0, 73, 0);
}}
.word-removed-before {{
color: white;
background-color: rgb(192, 78, 76);
}}
.word-added-before {{
color: white;
background-color: rgb(63, 128, 94);
}}
.spacer {{
margin-bottom: 1rem;
}}
Expand Down Expand Up @@ -321,30 +321,30 @@ fn process_old_new(
.line-removed-after {{
color: rgba(255, 0, 0, 1);
}}
.line-removed-after .word-added {{
color: black;
background-color: #D48B04;
}}
.line-added-after {{
color: rgba(0, 255, 0, 1);
}}
.line-added-after .word-added {{
color: black;
background-color: rgb(0, 255, 0);
}}
.line-removed-before {{
color: rgb(255, 159, 131);
}}
.line-added-before {{
color: rgba(11, 142, 0, 1);
}}
.word-removed-after {{
color: black;
background-color: rgba(255, 0, 0, 1);
}}
.word-added-after {{
.line-removed-before .word-removed {{
color: black;
background-color: rgba(0, 255, 0, 1);
background-color: rgb(100, 0, 0);
}}
.word-removed-before {{
color: black;
background-color: rgba(100, 0, 0, 1);
.line-added-before {{
color: rgba(11, 142, 0, 1);
}}
.word-added-before {{
.line-added-before .word-removed {{
color: black;
background-color: rgba(0, 100, 0, 1);
background-color: rgb(255, 0, 0);
}}
}}
</style>
Expand Down Expand Up @@ -510,17 +510,22 @@ impl HtmlDiffPrinter<'_> {
// diff lines though, since then the coloring distracts from what is
// relevant.)
if is_add || is_remove {
let prefix_class = match (hunk_token_status, is_add) {
(HunkTokenStatus::Removed, true) => "added-before",
(HunkTokenStatus::Removed, false) => "removed-before",
(HunkTokenStatus::Added, true) => "added-after",
(HunkTokenStatus::Added, false) => "removed-after",
let line_class = match (is_add, hunk_token_status) {
(true, HunkTokenStatus::Removed) => "line-added-before",
(false, HunkTokenStatus::Removed) => "line-removed-before",
(true, HunkTokenStatus::Added) => "line-added-after",
(false, HunkTokenStatus::Added) => "line-removed-after",
};
write!(f, r#"<span class="line-{prefix_class}">"#)?;
write!(f, r#"<span class="{line_class}">"#)?;

for (word, changed) in words {
if changed {
write!(f, r#"<span class="word-{prefix_class}">"#)?;
let word_class = match hunk_token_status {
HunkTokenStatus::Removed => "word-removed",
HunkTokenStatus::Added => "word-added",
};

write!(f, r#"<span class="{word_class}">"#)?;
pulldown_cmark_escape::escape_html(FmtWriter(&mut f), word)?;
write!(f, "</span>")?;
} else {
Expand Down