Files
novem/src/screen/dashboard/pull_request_diff_view.rs

528 lines
18 KiB
Rust
Raw Normal View History

use std::{sync::Arc, usize};
2026-05-24 16:44:10 +01:00
use gpui::{
AppContext, FocusHandle, InteractiveElement, IntoElement, ParentElement, Styled, div,
prelude::FluentBuilder,
};
2026-05-28 22:28:59 +01:00
2026-05-18 22:30:46 +08:00
use crate::{
2026-05-28 22:28:59 +01:00
api::{self},
app,
component::{
code_view::symbol_highlight_style,
diff_view::{DiffViewContent, DiffViewState, diff_view},
text_input::{self, TextInput, text_input},
},
query::{self, QueryStatus, read_query, use_query, watch_query},
2026-06-02 00:20:15 +01:00
util::{self, diff::DiffLineIndex},
2026-05-18 22:30:46 +08:00
};
pub(crate) struct PullRequestDiffView {
pr_query: query::Entity<api::issues::FetchPullRequest>,
2026-05-23 12:28:45 +01:00
content_diff_query: Option<query::Entity<api::repo::FetchFileDiff>>,
2026-05-24 16:44:10 +01:00
diff_view_state: DiffViewState,
diff_view_state_in_search_mode: Option<DiffViewState>,
2026-05-24 16:44:10 +01:00
diff_view_content: Option<DiffViewContent>,
diff_search_result: Option<DiffSearchResult>,
2026-05-28 22:28:59 +01:00
current_file_path: Option<Arc<str>>,
focus_handle: gpui::FocusHandle,
search_input: gpui::Entity<TextInput>,
2026-05-18 22:30:46 +08:00
}
2026-06-02 00:20:15 +01:00
struct DiffSearchHit {
diff_line_i: DiffLineIndex,
src_byte_range: std::ops::Range<usize>,
2026-06-02 00:35:40 +01:00
highlight_range: util::syntax_highlight::HighlightedRange,
2026-06-02 00:20:15 +01:00
}
struct DiffSearchResult {
cursor: DiffSearchResultCursor,
2026-06-02 00:20:15 +01:00
old_side: Vec<DiffSearchHit>,
new_side: Vec<DiffSearchHit>,
}
struct DiffSearchResultCursor {
2026-06-02 00:20:15 +01:00
side: util::diff::DiffSide,
2026-06-04 23:21:27 +01:00
diff_line_i: DiffLineIndex,
index: usize,
}
gpui::actions!([Search, Escape]);
const KEY_CONTEXT: &'static str = "PullRequestDiffView";
2026-05-18 22:30:46 +08:00
impl PullRequestDiffView {
2026-05-28 22:28:59 +01:00
pub(crate) fn new(pr_id: api::issues::Id, cx: &mut gpui::Context<Self>) -> Self {
let mut s = Self {
pr_query: use_query(api::issues::FetchPullRequest { id: pr_id }, cx),
content_diff_query: None,
diff_view_state: DiffViewState::new(),
diff_view_content: None,
diff_view_state_in_search_mode: None,
diff_search_result: None,
2026-05-28 22:28:59 +01:00
current_file_path: None,
focus_handle: cx.focus_handle(),
search_input: cx.new(|cx| TextInput::with_placeholder("Search", cx)),
2026-05-28 22:28:59 +01:00
};
s.on_create(cx);
s
}
2026-05-24 16:44:10 +01:00
pub(crate) fn key_bindings() -> [gpui::KeyBinding; 2] {
[
gpui::KeyBinding::new("cmd-f", Search, Some(KEY_CONTEXT)),
gpui::KeyBinding::new("escape", Escape, Some(KEY_CONTEXT)),
]
}
2026-05-28 22:28:59 +01:00
pub(crate) fn show_diff_for_file(
&mut self,
file_path: &Arc<str>,
cx: &mut gpui::Context<Self>,
) {
self.current_file_path = Some(Arc::clone(file_path));
2026-05-18 22:30:46 +08:00
self.start_content_queries(cx);
}
fn start_content_queries(&mut self, cx: &mut gpui::Context<Self>) {
2026-05-24 16:44:10 +01:00
if self.content_diff_query.is_some() {
return;
}
2026-05-28 22:28:59 +01:00
let Some(selected_file_path) = self.current_file_path.as_deref() else {
2026-05-24 16:44:10 +01:00
return;
};
2026-05-23 12:28:45 +01:00
let Some((old_file_ref, new_file_ref)) = ({
2026-05-18 22:30:46 +08:00
if let QueryStatus::Loaded(pr) = read_query(&self.pr_query, cx) {
Some((
2026-05-23 12:28:45 +01:00
api::repo::FileRef {
2026-05-18 22:30:46 +08:00
repo_slug: pr.base_repo_slug.clone(),
2026-05-24 16:44:10 +01:00
path: Arc::from(selected_file_path),
2026-05-18 22:30:46 +08:00
reff: Some(pr.base_ref.clone()),
},
2026-05-23 12:28:45 +01:00
api::repo::FileRef {
2026-05-18 22:30:46 +08:00
repo_slug: pr.head_repo_slug.clone(),
2026-05-24 16:44:10 +01:00
path: Arc::from(selected_file_path),
2026-05-18 22:30:46 +08:00
reff: Some(pr.head_ref.clone()),
},
))
} else {
None
}
}) else {
return;
};
2026-05-23 12:28:45 +01:00
let content_diff_query = use_query(
api::repo::FetchFileDiff {
base: old_file_ref,
head: new_file_ref,
},
cx,
);
_ = watch_query(&content_diff_query, Self::sync_content_diff_query, cx).detach();
2026-05-24 16:44:10 +01:00
2026-05-23 12:28:45 +01:00
self.content_diff_query = Some(content_diff_query);
2026-05-18 22:30:46 +08:00
}
2026-05-28 22:28:59 +01:00
fn on_create(&mut self, cx: &mut gpui::Context<Self>) {
_ = cx
.observe(&self.pr_query, |this, _, cx| {
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();
2026-05-28 22:28:59 +01:00
}
fn sync_content_diff_query(
&mut self,
query: &query::Entity<api::repo::FetchFileDiff>,
cx: &mut gpui::Context<Self>,
) {
if let Some(diff) = {
match read_query(query, cx) {
2026-05-28 22:28:59 +01:00
| QueryStatus::Loaded(diff) => Some(Arc::clone(diff)),
| _ => None,
}
} {
self.load_diff_view(diff, cx);
cx.notify();
}
}
fn load_diff_view(
&mut self,
content_diff: Arc<util::diff::ContentDiff>,
cx: &mut gpui::Context<Self>,
) {
let theme = app::current_theme(cx);
let old_content = content_diff.old_content.clone();
let new_content = content_diff.new_content.clone();
self.diff_view_state.reset(content_diff.len());
self.diff_view_content = Some(content_diff.into());
let theme_syntax = theme.syntax;
2026-05-28 22:28:59 +01:00
if let Some(path) = &self.current_file_path {
let path = Arc::clone(&path);
let file_type = util::file::file_type_from_path(&path);
let t1 = cx.background_spawn(async move {
util::syntax_highlight::highlight_content(old_content, file_type, &theme_syntax)
});
let t2 = cx.background_spawn(async move {
util::syntax_highlight::highlight_content(new_content, file_type, &theme_syntax)
});
_ = cx
.spawn(async move |weak, cx| match tokio::join!(t1, t2) {
2026-05-28 22:28:59 +01:00
| (Some(old_side_highlights), Some(new_side_highlights)) => {
_ = weak.update(cx, |this, cx| {
this.diff_view_state
.set_old_side_highlights(old_side_highlights);
this.diff_view_state
.set_new_side_highlights(new_side_highlights);
cx.notify();
});
}
| _ => {}
})
.detach();
}
}
fn search_in_diff(&mut self, search_str: &str, cx: &mut gpui::Context<Self>) {
2026-06-02 00:20:15 +01:00
let Some(diff_view_content) = &self.diff_view_content else {
return;
};
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)?;
2026-06-02 00:20:15 +01:00
let diff_line_i = diff_view_content
.diff
.diff_line_index_for_line(util::diff::DiffSide::Old, line_idx);
Some(DiffSearchHit {
diff_line_i,
2026-06-02 00:35:40 +01:00
src_byte_range: range.clone(),
highlight_range: (range, symbol_highlight_style(theme)),
2026-06-02 00:20:15 +01:00
})
})
.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)?;
2026-06-02 00:20:15 +01:00
let diff_line_i = diff_view_content
.diff
.diff_line_index_for_line(util::diff::DiffSide::New, line_idx);
Some(DiffSearchHit {
diff_line_i,
2026-06-02 00:35:40 +01:00
src_byte_range: range.clone(),
highlight_range: (range, symbol_highlight_style(theme)),
2026-06-02 00:20:15 +01:00
})
})
.collect::<Vec<_>>();
2026-06-02 00:35:40 +01:00
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
.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 {
2026-06-02 00:20:15 +01:00
side: util::diff::DiffSide::Old,
2026-06-04 23:21:27 +01:00
diff_line_i: old_search_result[0].diff_line_i,
index: 0,
}
} else {
DiffSearchResultCursor {
2026-06-02 00:20:15 +01:00
side: util::diff::DiffSide::New,
2026-06-04 23:21:27 +01:00
diff_line_i: new_search_result[0].diff_line_i,
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;
};
2026-06-02 00:35:40 +01:00
let theme = app::current_theme(cx);
2026-06-02 00:20:15 +01:00
let (current_side, other_side) = match search_result.cursor.side {
2026-06-04 23:21:27 +01:00
| util::diff::DiffSide::Old => (&search_result.old_side, &search_result.new_side),
| util::diff::DiffSide::New => (&search_result.new_side, &search_result.old_side),
};
2026-06-04 23:21:27 +01:00
let prev_side = search_result.cursor.side;
2026-06-02 00:20:15 +01:00
let current_search_hit = &current_side[search_result.cursor.index];
2026-06-02 00:35:40 +01:00
let highlight_range = match current_side.get(search_result.cursor.index + 1) {
2026-06-02 00:20:15 +01:00
| Some(DiffSearchHit {
diff_line_i,
src_byte_range,
2026-06-02 00:35:40 +01:00
..
2026-06-02 00:20:15 +01:00
}) 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;
Some((
2026-06-02 00:20:15 +01:00
src_byte_range.clone(),
gpui::HighlightStyle {
background_color: Some(gpui::red()),
..symbol_highlight_style(theme)
},
))
}
| next => {
2026-06-02 00:20:15 +01:00
let next_highlight_line = next
.map(|hit| hit.diff_line_i)
.unwrap_or(DiffLineIndex::MAX);
let mut i = 0;
2026-06-02 00:20:15 +01:00
let mut other_side_result: Option<(DiffLineIndex, usize, &std::ops::Range<usize>)> =
None;
while let Some(DiffSearchHit {
diff_line_i,
src_byte_range,
2026-06-02 00:35:40 +01:00
..
2026-06-02 00:20:15 +01:00
}) = &other_side.get(i)
{
if *diff_line_i == current_search_hit.diff_line_i
&& matches!(search_result.cursor.side, util::diff::DiffSide::Old)
{
// found other side highlight on the current line
2026-06-02 00:20:15 +01:00
// we are on old side, so jump to new side on same line
other_side_result = Some((*diff_line_i, i, src_byte_range));
break;
}
2026-06-02 00:20:15 +01:00
if *diff_line_i > current_search_hit.diff_line_i
&& *diff_line_i <= next_highlight_line
{
// found other side highlight in between current side highlight and next side highlight
2026-06-02 00:20:15 +01:00
other_side_result = Some((*diff_line_i, i, src_byte_range));
break;
}
2026-06-02 00:20:15 +01:00
if *diff_line_i > next_highlight_line {
break;
}
i += 1;
}
2026-06-04 23:21:27 +01:00
if let Some((diff_line_i, other_side_i, r)) = other_side_result {
if next_highlight_line == diff_line_i
&& matches!(search_result.cursor.side, util::diff::DiffSide::Old)
{
// there is a hit on new side on same diff line as the next hit on old side
// go to old side first
search_result.cursor.diff_line_i = diff_line_i;
search_result.cursor.index += 1;
} else {
// next cursor should be on other side with the found index
search_result.cursor.side = search_result.cursor.side.flipped();
search_result.cursor.diff_line_i = diff_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.index = search_result.cursor.index + 1;
Some((
2026-06-02 00:20:15 +01:00
next.src_byte_range.clone(),
gpui::HighlightStyle {
background_color: Some(gpui::red()),
..symbol_highlight_style(theme)
},
))
} else {
None
}
}
};
if let Some(highlight_range) = highlight_range {
2026-06-04 23:21:27 +01:00
{
let prev_highlighted_content = match prev_side {
| util::diff::DiffSide::Old => diff_view_state.old_side_highlights_mut(),
| util::diff::DiffSide::New => diff_view_state.new_side_highlights_mut(),
};
if let Some(mut content) = prev_highlighted_content {
content.replace_highlight_range(&current_search_hit.highlight_range);
}
}
2026-06-02 00:20:15 +01:00
let content = match search_result.cursor.side {
| util::diff::DiffSide::Old => diff_view_state.old_side_highlights_mut(),
| util::diff::DiffSide::New => diff_view_state.new_side_highlights_mut(),
};
if let Some(mut content) = content {
content.replace_highlight_range(&highlight_range);
}
}
2026-06-04 23:21:27 +01:00
self.diff_view_state
.scroll_to_diff_line(search_result.cursor.diff_line_i);
cx.notify();
}
fn open_search_box(&mut self, window: &mut gpui::Window, cx: &mut gpui::Context<Self>) {
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.diff_view_state_in_search_mode = None;
self.focus_handle.focus(window);
cx.notify();
}
}
impl gpui::Focusable for PullRequestDiffView {
fn focus_handle(&self, _: &gpui::App) -> FocusHandle {
self.focus_handle.clone()
}
2026-05-18 22:30:46 +08:00
}
impl gpui::Render for PullRequestDiffView {
fn render(
&mut self,
2026-05-23 12:28:45 +01:00
_window: &mut gpui::Window,
2026-05-28 22:28:59 +01:00
cx: &mut gpui::prelude::Context<Self>,
2026-05-18 22:30:46 +08:00
) -> impl gpui::IntoElement {
let theme = app::current_theme(cx);
2026-05-24 16:44:10 +01:00
let content_diff = self
.content_diff_query
.as_ref()
.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)
.track_focus(&self.focus_handle)
.flex()
.flex_col()
.size_full()
.when(is_search_input_visible, |it| {
it.child(
text_input(self.search_input.clone())
.w_full()
.text_color(theme.colors.text)
.text_xs()
.px_3()
.bg(theme.colors.surface_chrome)
.border_0()
.border_b_1()
.border_color(theme.colors.border_muted),
)
})
.when_some(
match (content_diff, &self.diff_view_content) {
| (QueryStatus::Loaded(_), Some(content)) => Some(content.clone()),
| (_, _) => None,
},
|it, content| {
it.child(
diff_view(
self.diff_view_state_in_search_mode
.as_ref()
.unwrap_or_else(|| &self.diff_view_state)
.clone(),
content.clone(),
)
.into_any_element(),
)
},
)
.on_action(cx.listener(|this, _: &Search, window, cx| {
this.open_search_box(window, cx);
}))
.on_action(cx.listener(|this, _: &Escape, window, cx| {
this.close_search_box(window, cx);
}))
2026-05-18 22:30:46 +08:00
}
}