Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 08:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix line bg highlight

Browse source
This commit is contained in:
gogongxt 2026-03-23 01:36:55 +08:00 committed by Kamil Cukrowski
parent 11c430a89a
commit e99faaf628
1 changed files with 52 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/components/diff.rs
View file

@ -975,14 +975,8 @@ impl DiffComponent {
});
}
DiffLineType::Header => {
// Add leading space to align with text content below
let header_content = format!(
" {}",
tabs_to_spaces(
line.content
.as_ref()
.to_string()
)
let header_content = tabs_to_spaces(
line.content.as_ref().to_string(),
);
result.push(SideBySideLine {
left_content: header_content,
@ -1085,7 +1079,7 @@ impl DiffComponent {
trim_offset(&line.left_content, scrolled_right);
let line_num_str = line
.left_line_num
.map_or(String::from(" "), |n| {
.map_or(String::from(" "), |n| {
format!("{n:4}")
});
@ -1107,11 +1101,26 @@ impl DiffComponent {
format!("{left_content}\n")
};
// For Header lines, content starts with " @" where the leading space
// aligns with text below. Split it so the leading space is not highlighted.
if line.left_type == DiffLineType::Header
&& left_content.starts_with(' ')
{
// For lines where left side is empty (e.g., Add lines without Delete pair),
// still apply selection highlight to maintain visual consistency.
// Show line_break symbol (¶) for empty Add/Delete lines, same as unified mode.
if line.left_content.is_empty() {
// Show line_break symbol for empty Add/Delete lines
let display_content =
if line.left_type != DiffLineType::None {
self.theme.line_break()
} else {
String::new()
};
let content = if selected {
format!(
"{:w$}\n",
display_content,
w = panel_width
)
} else {
format!("{display_content}\n")
};
Line::from(vec![
Span::styled(Cow::from(marker), marker_style),
Span::styled(
@ -1123,13 +1132,8 @@ impl DiffComponent {
Cow::from(" "),
self.theme.text(false, false),
),
// Leading space in header content - never highlighted
Span::styled(
Cow::from(" "),
self.theme.text(false, false),
),
Span::styled(
Cow::from(content[1..].to_string()),
Cow::from(content),
self.theme
.diff_line(line.left_type, selected),
),
@ -1169,7 +1173,7 @@ impl DiffComponent {
trim_offset(&line.right_content, scrolled_right);
let line_num_str = line
.right_line_num
.map_or(String::from(" "), |n| {
.map_or(String::from(" "), |n| {
format!("{n:4}")
});
@ -1191,8 +1195,30 @@ impl DiffComponent {
format!("{right_content}\n")
};
// For Header lines on right column (empty), don't highlight the filler
if line.right_type == DiffLineType::Header {
// For lines where right side is empty (Header or paired Delete),
// still apply selection highlight to maintain visual consistency.
// Show line_break symbol (¶) for empty Add/Delete lines, same as unified mode.
if line.right_type == DiffLineType::Header
|| line.right_content.is_empty()
{
// Show line_break symbol for empty Add/Delete lines (but not Header)
let display_content = if line.right_type
!= DiffLineType::None
&& line.right_type != DiffLineType::Header
{
self.theme.line_break()
} else {
String::new()
};
let filler = if selected {
format!(
"{:w$}\n",
display_content,
w = panel_width
)
} else {
format!("{display_content}\n")
};
Line::from(vec![
Span::styled(Cow::from(marker), marker_style),
Span::styled(
@ -1204,10 +1230,10 @@ impl DiffComponent {
Cow::from(" "),
self.theme.text(false, false),
),
// Header right side is empty, don't highlight filler
Span::styled(
Cow::from(content),
self.theme.text(false, false),
Cow::from(filler),
self.theme
.diff_line(line.right_type, selected),
),
])
} else {