kennethnym/novem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: search result advancing highlight

Browse Source
This commit is contained in:
Kenneth
2026-06-02 00:35:40 +01:00
parent 6f3245f927
commit ccc93d2429
2 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/screen/dashboard/pull_request_diff_view.rs
View File

@@ -25,7 +25,6 @@ pub(crate) struct PullRequestDiffView {
diff_view_state_in_search_mode: Option<DiffViewState>,
diff_view_content: Option<DiffViewContent>,
diff_search_result: Option<DiffSearchResult>,
diff_search_result_cursor: Option<DiffSearchResultCursor>,
current_file_path: Option<Arc<str>>,
@@ -36,6 +35,7 @@ pub(crate) struct PullRequestDiffView {
struct DiffSearchHit {
diff_line_i: DiffLineIndex,
src_byte_range: std::ops::Range<usize>,
highlight_range: util::syntax_highlight::HighlightedRange,
}
struct DiffSearchResult {
@@ -62,7 +62,6 @@ impl PullRequestDiffView {
diff_view_content: None,
diff_view_state_in_search_mode: None,
diff_search_result: None,
diff_search_result_cursor: None,
current_file_path: None,
focus_handle: cx.focus_handle(),
@@ -239,7 +238,8 @@ impl PullRequestDiffView {
.diff_line_index_for_line(util::diff::DiffSide::Old, line_idx);
Some(DiffSearchHit {
diff_line_i,
src_byte_range: range,
src_byte_range: range.clone(),
highlight_range: (range, symbol_highlight_style(theme)),
})
})
.collect::<Vec<_>>();
@@ -255,23 +255,18 @@ impl PullRequestDiffView {
.diff_line_index_for_line(util::diff::DiffSide::New, line_idx);
Some(DiffSearchHit {
diff_line_i,
src_byte_range: range,
src_byte_range: range.clone(),
highlight_range: (range, symbol_highlight_style(theme)),
})
})
.collect::<Vec<_>>();
let old_side_highlights =
old_search_result
.iter()
.map(|hit| -> util::syntax_highlight::HighlightedRange {
(hit.src_byte_range.clone(), symbol_highlight_style(theme))
});
let new_side_highlights =
new_search_result
.iter()
.map(|hit| -> util::syntax_highlight::HighlightedRange {
(hit.src_byte_range.clone(), symbol_highlight_style(theme))
});
let old_side_highlights = old_search_result
.iter()
.map(|hit| -> &util::syntax_highlight::HighlightedRange { &hit.highlight_range });
let new_side_highlights = new_search_result
.iter()
.map(|hit| -> &util::syntax_highlight::HighlightedRange { &hit.highlight_range });
if let Some(h) = self
.diff_view_state
@@ -323,18 +318,38 @@ impl PullRequestDiffView {
return;
};
let (current_side, other_side) = match search_result.cursor.side {
| util::diff::DiffSide::Old => (&search_result.old_side, &search_result.new_side),
| util::diff::DiffSide::New => (&search_result.new_side, &search_result.old_side),
};
let theme = app::current_theme(cx);
let (current_side, other_side) = match search_result.cursor.side {
| util::diff::DiffSide::Old => {
// clear current cursor highlight
// by replacing it with the normal styled highlighted range
if let Some(mut highlights) = diff_view_state.old_side_highlights_mut() {
highlights.replace_highlight_range(
&search_result.old_side[search_result.cursor.index].highlight_range,
);
}
(&search_result.old_side, &search_result.new_side)
}
| util::diff::DiffSide::New => {
// clear current cursor highlight
// by replacing it with the normal styled highlighted range
if let Some(mut highlights) = diff_view_state.new_side_highlights_mut() {
highlights.replace_highlight_range(
&search_result.new_side[search_result.cursor.index].highlight_range,
);
}
(&search_result.new_side, &search_result.old_side)
}
};
let current_search_hit = &current_side[search_result.cursor.index];
let highlight_range = match current_side.get(search_result.cursor.index + 1) {
| Some(DiffSearchHit {
diff_line_i,
src_byte_range,
..
}) if *diff_line_i == current_search_hit.diff_line_i => {
// go to next search result on same side & same line
search_result.cursor.index += 1;
@@ -357,6 +372,7 @@ impl PullRequestDiffView {
while let Some(DiffSearchHit {
diff_line_i,
src_byte_range,
..
}) = &other_side.get(i)
{
if *diff_line_i == current_search_hit.diff_line_i