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

feat: search result highlight in pr diff view

Browse Source
This commit is contained in:
Kenneth
2026-06-01 01:15:47 +01:00
parent f5ebb210ac
commit 240d48ff1e
4 changed files with 488 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
use std::sync::Arc;
use std::{sync::Arc, usize};
use gpui::{
AppContext, FocusHandle, InteractiveElement, IntoElement, ParentElement, Styled, div,
@@ -9,8 +9,9 @@ use crate::{
api::{self},
app,
component::{
code_view::symbol_highlight_style,
diff_view::{DiffViewContent, DiffViewState, diff_view},
text_input::{TextInput, text_input},
text_input::{self, TextInput, text_input},
},
query::{self, QueryStatus, read_query, use_query, watch_query},
util,
@@ -19,15 +20,31 @@ use crate::{
pub(crate) struct PullRequestDiffView {
pr_query: query::Entity<api::issues::FetchPullRequest>,
content_diff_query: Option<query::Entity<api::repo::FetchFileDiff>>,
diff_view_state: DiffViewState,
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>>,
focus_handle: gpui::FocusHandle,
is_search_input_visible: bool,
search_input: gpui::Entity<TextInput>,
}
struct DiffSearchResult {
cursor: DiffSearchResultCursor,
old_side: Vec<(usize, std::ops::Range<usize>)>,
new_side: Vec<(usize, std::ops::Range<usize>)>,
}
struct DiffSearchResultCursor {
is_old: bool,
line_index: usize,
index: usize,
}
gpui::actions!([Search, Escape]);
const KEY_CONTEXT: &'static str = "PullRequestDiffView";
@@ -39,10 +56,12 @@ impl PullRequestDiffView {
content_diff_query: None,
diff_view_state: DiffViewState::new(),
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(),
is_search_input_visible: false,
search_input: cx.new(|cx| TextInput::with_placeholder("Search", cx)),
};
s.on_create(cx);
@@ -112,6 +131,18 @@ impl PullRequestDiffView {
this.start_content_queries(cx);
})
.detach();
_ = cx
.subscribe(&self.search_input, |this, _, event, cx| match event {
| text_input::Event::Changed(value) => {
this.search_in_diff(&value, cx);
}
| text_input::Event::Submitted(_query) => {
this.advance_search_result_cursor(cx);
}
})
.detach();
}
fn sync_content_diff_query(
@@ -172,14 +203,205 @@ impl PullRequestDiffView {
}
}
fn search_in_diff(&mut self, search_str: &str, cx: &mut gpui::Context<Self>) {
let diff_view_state_in_search_mode = self
.diff_view_state_in_search_mode
.get_or_insert(DiffViewState::fork_from(&self.diff_view_state));
let Some(query) = &self.content_diff_query else {
return;
};
let QueryStatus::Loaded(diff) = read_query(query, cx) else {
return;
};
let theme = app::current_theme(cx);
let search_str_len = search_str.len();
let old_search_result = memchr::memmem::find_iter(&diff.old_content, search_str.as_bytes())
.filter_map(|idx| {
let range = idx..idx + search_str_len;
let line_idx = self
.diff_view_state
.old_side_highlights()?
.line_index_of_range(&range)?;
Some((line_idx, range))
})
.collect::<Vec<_>>();
let new_search_result = memchr::memmem::find_iter(&diff.new_content, search_str.as_bytes())
.filter_map(|idx| {
let range = idx..idx + search_str_len;
let line_idx = self
.diff_view_state
.new_side_highlights()?
.line_index_of_range(&range)?;
Some((line_idx, range))
})
.collect::<Vec<_>>();
let old_side_highlights =
old_search_result
.iter()
.map(|(_, r)| -> util::syntax_highlight::HighlightedRange {
(r.clone(), symbol_highlight_style(theme))
});
let new_side_highlights =
new_search_result
.iter()
.map(|(_, r)| -> util::syntax_highlight::HighlightedRange {
(r.clone(), symbol_highlight_style(theme))
});
if let Some(h) = self
.diff_view_state
.old_side_highlights()
.map(|it| it.clone())
{
diff_view_state_in_search_mode
.set_old_side_highlights(h.extended_with_highlights(old_side_highlights));
}
if let Some(h) = self
.diff_view_state
.new_side_highlights()
.map(|it| it.clone())
{
diff_view_state_in_search_mode
.set_new_side_highlights(h.extended_with_highlights(new_side_highlights));
}
if old_search_result.is_empty() && new_search_result.is_empty() {
self.diff_search_result = None;
} else {
let cursor = if !old_search_result.is_empty() {
DiffSearchResultCursor {
is_old: true,
line_index: old_search_result[0].0,
index: 0,
}
} else {
DiffSearchResultCursor {
is_old: false,
line_index: new_search_result[0].0,
index: 0,
}
};
self.diff_search_result = Some(DiffSearchResult {
cursor,
old_side: old_search_result,
new_side: new_search_result,
});
}
cx.notify();
}
fn advance_search_result_cursor(&mut self, cx: &mut gpui::Context<Self>) {
let (Some(search_result), Some(diff_view_state)) = (
&mut self.diff_search_result,
&mut self.diff_view_state_in_search_mode,
) else {
return;
};
let (current_side, other_side) = if search_result.cursor.is_old {
(&search_result.old_side, &search_result.new_side)
} else {
(&search_result.new_side, &search_result.old_side)
};
let theme = app::current_theme(cx);
let current_line_index = search_result.cursor.line_index;
let highlight_range = match current_side.get(search_result.cursor.index + 1) {
| Some((next_highlight_line, next_range)) if *next_highlight_line == current_line_index => {
// go to next search result on same side & same line
search_result.cursor.index += 1;
Some((
next_range.clone(),
gpui::HighlightStyle {
background_color: Some(gpui::red()),
..symbol_highlight_style(theme)
},
))
}
| next => {
let next_highlight_line = next.map(|(line, _)| *line).unwrap_or(usize::MAX);
let mut i = 0;
let mut other_side_result: Option<(usize, usize, &std::ops::Range<usize>)> = None;
while let Some((other_side_line_i, r)) = &other_side.get(i) {
if *other_side_line_i == current_line_index {
// found other side highlight on the current line
other_side_result = Some((*other_side_line_i, i, r));
break;
}
if *other_side_line_i > current_line_index
&& *other_side_line_i < next_highlight_line
{
// found other side highlight in between current side highlight and next side highlight
other_side_result = Some((*other_side_line_i, i, r));
break;
}
if *other_side_line_i > next_highlight_line {
break;
}
i += 1;
}
if let Some((other_side_line_i, other_side_i, r)) = other_side_result {
// next cursor should be on other side with the found index
search_result.cursor.is_old = !search_result.cursor.is_old;
search_result.cursor.line_index = other_side_line_i;
search_result.cursor.index = other_side_i;
Some((
r.clone(),
gpui::HighlightStyle {
background_color: Some(gpui::red()),
..symbol_highlight_style(theme)
},
))
} else if let Some(next) = next {
// stay on old side, point to next old side highlight
search_result.cursor.line_index = next_highlight_line;
search_result.cursor.index = search_result.cursor.index + 1;
Some((
next.1.clone(),
gpui::HighlightStyle {
background_color: Some(gpui::red()),
..symbol_highlight_style(theme)
},
))
} else {
None
}
}
};
if let Some(highlight_range) = highlight_range {
let content = if search_result.cursor.is_old {
diff_view_state.old_side_highlights_mut()
} else {
diff_view_state.new_side_highlights_mut()
};
if let Some(mut content) = content {
println!("replacing highlight range {:?}", highlight_range);
content.replace_highlight_range(&highlight_range);
}
}
cx.notify();
}
fn open_search_box(&mut self, window: &mut gpui::Window, cx: &mut gpui::Context<Self>) {
self.is_search_input_visible = true;
self.diff_view_state_in_search_mode = Some(DiffViewState::fork_from(&self.diff_view_state));
cx.focus_view(&self.search_input, window);
cx.notify();
}
fn close_search_box(&mut self, window: &mut gpui::Window, cx: &mut gpui::Context<Self>) {
self.is_search_input_visible = false;
self.diff_view_state_in_search_mode = None;
self.focus_handle.focus(window);
cx.notify();
}
@@ -204,6 +426,8 @@ impl gpui::Render for PullRequestDiffView {
.map(|q| read_query(q, cx))
.unwrap_or(QueryStatus::Loading);
let is_search_input_visible = self.diff_view_state_in_search_mode.is_some();
div()
.id(KEY_CONTEXT)
.key_context(KEY_CONTEXT)
@@ -211,7 +435,7 @@ impl gpui::Render for PullRequestDiffView {
.flex()
.flex_col()
.size_full()
.when(self.is_search_input_visible, |it| {
.when(is_search_input_visible, |it| {
it.child(
text_input(self.search_input.clone())
.w_full()
@@ -231,7 +455,14 @@ impl gpui::Render for PullRequestDiffView {
},
|it, content| {
it.child(
diff_view(self.diff_view_state.clone(), content.clone()).into_any_element(),
diff_view(
self.diff_view_state_in_search_mode
.as_ref()
.unwrap_or_else(|| &self.diff_view_state)
.clone(),
content.clone(),
)
.into_any_element(),
)
},
)