use std::{ ops::{Range, RangeInclusive}, sync::Arc,}; use collections::{hash_map, HashMap, HashSet};use git::diff::{DiffHunk, DiffHunkStatus};use gpui::{Action, AppContext, CursorStyle, Hsla, Model, MouseButton, Subscription, Task, View};use language::Buffer;use multi_buffer::{ Anchor, AnchorRangeExt, ExcerptRange, MultiBuffer, MultiBufferRow, MultiBufferSnapshot, ToPoint,};use settings::SettingsStore;use text::{BufferId, Point};use ui::{ div, h_flex, rems, v_flex, ActiveTheme, Context as _, ContextMenu, InteractiveElement, IntoElement, ParentElement, Pixels, Styled, ViewContext, VisualContext,};use util::{debug_panic, RangeExt}; use crate::{ editor_settings::CurrentLineHighlight, git::{diff_hunk_to_display, DisplayDiffHunk}, hunk_status, hunks_for_selections, mouse_context_menu::MouseContextMenu, BlockDisposition, BlockProperties, BlockStyle, CustomBlockId, DiffRowHighlight, Editor, EditorElement, EditorSnapshot, ExpandAllHunkDiffs, RangeToAnchorExt, RevertFile, RevertSelectedHunks, ToDisplayPoint, ToggleHunkDiff,}; #[derive(Debug, Clone)]pub(super) struct HoveredHunk { pub multi_buffer_range: Range<Anchor>, pub status: DiffHunkStatus, pub diff_base_byte_range: Range<usize>,} #[derive(Debug, Default)]pub(super) struct ExpandedHunks { hunks: Vec<ExpandedHunk>, diff_base: HashMap<BufferId, DiffBaseBuffer>, hunk_update_tasks: HashMap<Option<BufferId>, Task<()>>,} #[derive(Debug)]struct DiffBaseBuffer { buffer: Model<Buffer>, diff_base_version: usize,} impl ExpandedHunks { pub fn hunks(&self, include_folded: bool) -> impl Iterator<Item = &ExpandedHunk> { self.hunks .iter() .filter(move |hunk| include_folded || !hunk.folded) }} #[derive(Debug, Clone)]pub(super) struct ExpandedHunk { pub block: Option<CustomBlockId>, pub hunk_range: Range<Anchor>, pub diff_base_byte_range: Range<usize>, pub status: DiffHunkStatus, pub folded: bool,} impl Editor { pub(super) fn open_hunk_context_menu( &mut self, hovered_hunk: HoveredHunk, clicked_point: gpui::Point<Pixels>, cx: &mut ViewContext<Editor>, ) { let focus_handle = self.focus_handle.clone(); let expanded = self .expanded_hunks .hunks(false) .any(|expanded_hunk| expanded_hunk.hunk_range == hovered_hunk.multi_buffer_range); let editor_handle = cx.view().clone(); let editor_snapshot = self.snapshot(cx); let start_point = self .to_pixel_point(hovered_hunk.multi_buffer_range.start, &editor_snapshot, cx) .unwrap_or(clicked_point); let end_point = self .to_pixel_point(hovered_hunk.multi_buffer_range.start, &editor_snapshot, cx) .unwrap_or(clicked_point); let norm = |a: gpui::Point<Pixels>, b: gpui::Point<Pixels>| (a.x - b.x).abs() + (a.y - b.y).abs(); let closest_source = if norm(start_point, clicked_point) < norm(end_point, clicked_point) { hovered_hunk.multi_buffer_range.start } else { hovered_hunk.multi_buffer_range.end }; self.mouse_context_menu = MouseContextMenu::pinned_to_editor( self, closest_source, clicked_point, ContextMenu::build(cx, move |menu, _| { menu.on_blur_subscription(Subscription::new(|| {})) .context(focus_handle) .entry( if expanded { "Collapse Hunk" } else { "Expand Hunk" }, Some(ToggleHunkDiff.boxed_clone()), { let editor = editor_handle.clone(); let hunk = hovered_hunk.clone(); move |cx| { editor.update(cx, |editor, cx| { editor.toggle_hovered_hunk(&hunk, cx); }); } }, ) .entry("Revert Hunk", Some(RevertSelectedHunks.boxed_clone()), { let editor = editor_handle.clone(); let hunk = hovered_hunk.clone(); move |cx| { let multi_buffer = editor.read(cx).buffer().clone(); let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx); let mut revert_changes = HashMap::default(); if let Some(hunk) = crate::hunk_diff::to_diff_hunk(&hunk, &multi_buffer_snapshot) { Editor::prepare_revert_change( &mut revert_changes, &multi_buffer, &hunk, cx, ); } if !revert_changes.is_empty() { editor.update(cx, |editor, cx| editor.revert(revert_changes, cx)); } } }) .action("Revert File", RevertFile.boxed_clone()) }), cx, ) } pub(super) fn toggle_hovered_hunk( &mut self, hovered_hunk: &HoveredHunk, cx: &mut ViewContext<Editor>, ) { let editor_snapshot = self.snapshot(cx); if let Some(diff_hunk) = to_diff_hunk(hovered_hunk, &editor_snapshot.buffer_snapshot) { self.toggle_hunks_expanded(vec![diff_hunk], cx); self.change_selections(None, cx, |selections| selections.refresh()); } } pub fn toggle_hunk_diff(&mut self, _: &ToggleHunkDiff, cx: &mut ViewContext<Self>) { let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx); let selections = self.selections.disjoint_anchors(); self.toggle_hunks_expanded( hunks_for_selections(&multi_buffer_snapshot, &selections), cx, ); } pub fn expand_all_hunk_diffs(&mut self, _: &ExpandAllHunkDiffs, cx: &mut ViewContext<Self>) { let snapshot = self.snapshot(cx); let display_rows_with_expanded_hunks = self .expanded_hunks .hunks(false) .map(|hunk| &hunk.hunk_range) .map(|anchor_range| { ( anchor_range .start .to_display_point(&snapshot.display_snapshot) .row(), anchor_range .end .to_display_point(&snapshot.display_snapshot) .row(), ) }) .collect::<HashMap<_, _>>(); let hunks = snapshot .display_snapshot .buffer_snapshot .git_diff_hunks_in_range(MultiBufferRow::MIN..MultiBufferRow::MAX) .filter(|hunk| { let hunk_display_row_range = Point::new(hunk.associated_range.start.0, 0) .to_display_point(&snapshot.display_snapshot) ..Point::new(hunk.associated_range.end.0, 0) .to_display_point(&snapshot.display_snapshot); let row_range_end = display_rows_with_expanded_hunks.get(&hunk_display_row_range.start.row()); row_range_end.is_none() || row_range_end != Some(&hunk_display_row_range.end.row()) }); self.toggle_hunks_expanded(hunks.collect(), cx); } fn toggle_hunks_expanded( &mut self, hunks_to_toggle: Vec<DiffHunk<MultiBufferRow>>, cx: &mut ViewContext<Self>, ) { let previous_toggle_task = self.expanded_hunks.hunk_update_tasks.remove(&None); let new_toggle_task = cx.spawn(move |editor, mut cx| async move { if let Some(task) = previous_toggle_task { task.await; } editor .update(&mut cx, |editor, cx| { let snapshot = editor.snapshot(cx); let mut hunks_to_toggle = hunks_to_toggle.into_iter().fuse().peekable(); let mut highlights_to_remove = Vec::with_capacity(editor.expanded_hunks.hunks.len()); let mut blocks_to_remove = HashSet::default(); let mut hunks_to_expand = Vec::new(); editor.expanded_hunks.hunks.retain(|expanded_hunk| { if expanded_hunk.folded { return true; } let expanded_hunk_row_range = expanded_hunk .hunk_range .start .to_display_point(&snapshot) .row() ..expanded_hunk .hunk_range .end .to_display_point(&snapshot) .row(); let mut retain = true; while let Some(hunk_to_toggle) = hunks_to_toggle.peek() { match diff_hunk_to_display(hunk_to_toggle, &snapshot) { DisplayDiffHunk::Folded { .. } => { hunks_to_toggle.next(); continue; } DisplayDiffHunk::Unfolded { diff_base_byte_range, display_row_range, multi_buffer_range, status, } => { let hunk_to_toggle_row_range = display_row_range; if hunk_to_toggle_row_range.start > expanded_hunk_row_range.end { break; } else if expanded_hunk_row_range == hunk_to_toggle_row_range { highlights_to_remove.push(expanded_hunk.hunk_range.clone()); blocks_to_remove.extend(expanded_hunk.block); hunks_to_toggle.next(); retain = false; break; } else { hunks_to_expand.push(HoveredHunk { status, multi_buffer_range, diff_base_byte_range, }); hunks_to_toggle.next(); continue; } } } } retain }); for remaining_hunk in hunks_to_toggle { let remaining_hunk_point_range = Point::new(remaining_hunk.associated_range.start.0, 0) ..Point::new(remaining_hunk.associated_range.end.0, 0); hunks_to_expand.push(HoveredHunk { status: hunk_status(&remaining_hunk), multi_buffer_range: remaining_hunk_point_range .to_anchors(&snapshot.buffer_snapshot), diff_base_byte_range: remaining_hunk.diff_base_byte_range.clone(), }); } for removed_rows in highlights_to_remove { editor.highlight_rows::<DiffRowHighlight>( to_inclusive_row_range(removed_rows, &snapshot), None, false, cx, ); } editor.remove_blocks(blocks_to_remove, None, cx); for hunk in hunks_to_expand { editor.expand_diff_hunk(None, &hunk, cx); } cx.notify(); }) .ok(); }); self.expanded_hunks .hunk_update_tasks .insert(None, cx.background_executor().spawn(new_toggle_task)); } pub(super) fn expand_diff_hunk( &mut self, diff_base_buffer: Option<Model<Buffer>>, hunk: &HoveredHunk, cx: &mut ViewContext<'_, Editor>, ) -> Option<()> { let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx); let multi_buffer_row_range = hunk .multi_buffer_range .start .to_point(&multi_buffer_snapshot) ..hunk.multi_buffer_range.end.to_point(&multi_buffer_snapshot); let hunk_start = hunk.multi_buffer_range.start; let hunk_end = hunk.multi_buffer_range.end; let buffer = self.buffer().clone(); let snapshot = self.snapshot(cx); let (diff_base_buffer, deleted_text_lines) = buffer.update(cx, |buffer, cx| { let hunk = buffer_diff_hunk(&snapshot.buffer_snapshot, multi_buffer_row_range.clone())?; let mut buffer_ranges = buffer.range_to_buffer_ranges(multi_buffer_row_range, cx); if buffer_ranges.len() == 1 { let (buffer, _, _) = buffer_ranges.pop()?; let diff_base_buffer = diff_base_buffer .or_else(|| self.current_diff_base_buffer(&buffer, cx)) .or_else(|| create_diff_base_buffer(&buffer, cx))?; let buffer = buffer.read(cx); let deleted_text_lines = buffer.diff_base().map(|diff_base| { let diff_start_row = diff_base .offset_to_point(hunk.diff_base_byte_range.start) .row; let diff_end_row = diff_base.offset_to_point(hunk.diff_base_byte_range.end).row; let line_count = diff_end_row - diff_start_row; line_count })?; Some((diff_base_buffer, deleted_text_lines)) } else { None } })?; let block_insert_index = match self.expanded_hunks.hunks.binary_search_by(|probe| { probe .hunk_range .start .cmp(&hunk_start, &multi_buffer_snapshot) }) { Ok(_already_present) => return None, Err(ix) => ix, }; let block = match hunk.status { DiffHunkStatus::Removed => { self.insert_deleted_text_block(diff_base_buffer, deleted_text_lines, &hunk, cx) } DiffHunkStatus::Added => { self.highlight_rows::<DiffRowHighlight>( to_inclusive_row_range(hunk_start..hunk_end, &snapshot), Some(added_hunk_color(cx)), false, cx, ); None } DiffHunkStatus::Modified => { self.highlight_rows::<DiffRowHighlight>( to_inclusive_row_range(hunk_start..hunk_end, &snapshot), Some(added_hunk_color(cx)), false, cx, ); self.insert_deleted_text_block(diff_base_buffer, deleted_text_lines, &hunk, cx) } }; self.expanded_hunks.hunks.insert( block_insert_index, ExpandedHunk { block, hunk_range: hunk_start..hunk_end, status: hunk.status, folded: false, diff_base_byte_range: hunk.diff_base_byte_range.clone(), }, ); Some(()) } fn insert_deleted_text_block( &mut self, diff_base_buffer: Model<Buffer>, deleted_text_height: u32, hunk: &HoveredHunk, cx: &mut ViewContext<'_, Self>, ) -> Option<CustomBlockId> { let deleted_hunk_color = deleted_hunk_color(cx); let (editor_height, editor_with_deleted_text) = editor_with_deleted_text(diff_base_buffer, deleted_hunk_color, hunk, cx); let editor = cx.view().clone(); let hunk = hunk.clone(); let height = editor_height.max(deleted_text_height); let mut new_block_ids = self.insert_blocks( Some(BlockProperties { position: hunk.multi_buffer_range.start, height, style: BlockStyle::Flex, disposition: BlockDisposition::Above, render: Box::new(move |cx| { let Some(gutter_bounds) = editor.read(cx).gutter_bounds() else { return div().into_any_element(); }; let (gutter_dimensions, hunk_bounds, close_button) = editor.update(cx.context, |editor, cx| { let editor_snapshot = editor.snapshot(cx); let hunk_display_range = hunk .multi_buffer_range .clone() .to_display_points(&editor_snapshot); let gutter_dimensions = editor.gutter_dimensions; let hunk_bounds = EditorElement::diff_hunk_bounds( &editor_snapshot, cx.line_height(), gutter_bounds, &DisplayDiffHunk::Unfolded { diff_base_byte_range: hunk.diff_base_byte_range.clone(), multi_buffer_range: hunk.multi_buffer_range.clone(), display_row_range: hunk_display_range.start.row() ..hunk_display_range.end.row(), status: hunk.status, }, ); let close_button = editor.close_hunk_diff_button( hunk.clone(), hunk_display_range.start.row(), cx, ); (gutter_dimensions, hunk_bounds, close_button) }); let click_editor = editor.clone(); let clicked_hunk = hunk.clone(); h_flex() .id("gutter with editor") .bg(deleted_hunk_color) .h(height as f32 * cx.line_height()) .w_full() .child( h_flex() .id("gutter") .max_w(gutter_dimensions.full_width()) .min_w(gutter_dimensions.full_width()) .size_full() .child( h_flex() .id("gutter hunk") .pl(gutter_dimensions.margin + gutter_dimensions .git_blame_entries_width .unwrap_or_default()) .max_w(hunk_bounds.size.width) .min_w(hunk_bounds.size.width) .size_full() .cursor(CursorStyle::PointingHand) .on_mouse_down(MouseButton::Left, { let click_hunk = hunk.clone(); move |e, cx| { let modifiers = e.modifiers; if modifiers.control || modifiers.platform { click_editor.update(cx, |editor, cx| { editor.toggle_hovered_hunk(&click_hunk, cx); }); } else { click_editor.update(cx, |editor, cx| { editor.open_hunk_context_menu( clicked_hunk.clone(), e.position, cx, ); }); } } }), ) .child( v_flex() .size_full() .pt(rems(0.25)) .justify_start() .child(close_button), ), ) .child(editor_with_deleted_text.clone()) .into_any_element()Lines 1–500 of 896. Load more
use std::{ ops::{Range, RangeInclusive}, sync::Arc, }; use collections::{hash_map, HashMap, HashSet}; use git::diff::{DiffHunk, DiffHunkStatus}; use gpui::{Action, AppContext, CursorStyle, Hsla, Model, MouseButton, Subscription, Task, View}; use language::Buffer; use multi_buffer::{ Anchor, AnchorRangeExt, ExcerptRange, MultiBuffer, MultiBufferRow, MultiBufferSnapshot, ToPoint, }; use settings::SettingsStore; use text::{BufferId, Point}; use ui::{ div, h_flex, rems, v_flex, ActiveTheme, Context as _, ContextMenu, InteractiveElement, IntoElement, ParentElement, Pixels, Styled, ViewContext, VisualContext, }; use util::{debug_panic, RangeExt}; use crate::{ editor_settings::CurrentLineHighlight, git::{diff_hunk_to_display, DisplayDiffHunk}, hunk_status, hunks_for_selections, mouse_context_menu::MouseContextMenu, BlockDisposition, BlockProperties, BlockStyle, CustomBlockId, DiffRowHighlight, Editor, EditorElement, EditorSnapshot, ExpandAllHunkDiffs, RangeToAnchorExt, RevertFile, RevertSelectedHunks, ToDisplayPoint, ToggleHunkDiff, }; #[derive(Debug, Clone)] pub(super) struct HoveredHunk { pub multi_buffer_range: Range<Anchor>, pub status: DiffHunkStatus, pub diff_base_byte_range: Range<usize>, } #[derive(Debug, Default)] pub(super) struct ExpandedHunks { hunks: Vec<ExpandedHunk>, diff_base: HashMap<BufferId, DiffBaseBuffer>, hunk_update_tasks: HashMap<Option<BufferId>, Task<()>>, } #[derive(Debug)] struct DiffBaseBuffer { buffer: Model<Buffer>, diff_base_version: usize, } impl ExpandedHunks { pub fn hunks(&self, include_folded: bool) -> impl Iterator<Item = &ExpandedHunk> { self.hunks .iter() .filter(move |hunk| include_folded || !hunk.folded) } } #[derive(Debug, Clone)] pub(super) struct ExpandedHunk { pub block: Option<CustomBlockId>, pub hunk_range: Range<Anchor>, pub diff_base_byte_range: Range<usize>, pub status: DiffHunkStatus, pub folded: bool, } impl Editor { pub(super) fn open_hunk_context_menu( &mut self, hovered_hunk: HoveredHunk, clicked_point: gpui::Point<Pixels>, cx: &mut ViewContext<Editor>, ) { let focus_handle = self.focus_handle.clone(); let expanded = self .expanded_hunks .hunks(false) .any(|expanded_hunk| expanded_hunk.hunk_range == hovered_hunk.multi_buffer_range); let editor_handle = cx.view().clone(); let editor_snapshot = self.snapshot(cx); let start_point = self .to_pixel_point(hovered_hunk.multi_buffer_range.start, &editor_snapshot, cx) .unwrap_or(clicked_point); let end_point = self .to_pixel_point(hovered_hunk.multi_buffer_range.start, &editor_snapshot, cx) .unwrap_or(clicked_point); let norm = |a: gpui::Point<Pixels>, b: gpui::Point<Pixels>| (a.x - b.x).abs() + (a.y - b.y).abs(); let closest_source = if norm(start_point, clicked_point) < norm(end_point, clicked_point) { hovered_hunk.multi_buffer_range.start } else { hovered_hunk.multi_buffer_range.end }; self.mouse_context_menu = MouseContextMenu::pinned_to_editor( self, closest_source, clicked_point, ContextMenu::build(cx, move |menu, _| { menu.on_blur_subscription(Subscription::new(|| {})) .context(focus_handle) .entry( if expanded { "Collapse Hunk" } else { "Expand Hunk" }, Some(ToggleHunkDiff.boxed_clone()), { let editor = editor_handle.clone(); let hunk = hovered_hunk.clone(); move |cx| { editor.update(cx, |editor, cx| { editor.toggle_hovered_hunk(&hunk, cx); }); } }, ) .entry("Revert Hunk", Some(RevertSelectedHunks.boxed_clone()), { let editor = editor_handle.clone(); let hunk = hovered_hunk.clone(); move |cx| { let multi_buffer = editor.read(cx).buffer().clone(); let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx); let mut revert_changes = HashMap::default(); if let Some(hunk) = crate::hunk_diff::to_diff_hunk(&hunk, &multi_buffer_snapshot) { Editor::prepare_revert_change( &mut revert_changes, &multi_buffer, &hunk, cx, ); } if !revert_changes.is_empty() { editor.update(cx, |editor, cx| editor.revert(revert_changes, cx)); } } }) .action("Revert File", RevertFile.boxed_clone()) }), cx, ) } pub(super) fn toggle_hovered_hunk( &mut self, hovered_hunk: &HoveredHunk, cx: &mut ViewContext<Editor>, ) { let editor_snapshot = self.snapshot(cx); if let Some(diff_hunk) = to_diff_hunk(hovered_hunk, &editor_snapshot.buffer_snapshot) { self.toggle_hunks_expanded(vec![diff_hunk], cx); self.change_selections(None, cx, |selections| selections.refresh()); } } pub fn toggle_hunk_diff(&mut self, _: &ToggleHunkDiff, cx: &mut ViewContext<Self>) { let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx); let selections = self.selections.disjoint_anchors(); self.toggle_hunks_expanded( hunks_for_selections(&multi_buffer_snapshot, &selections), cx, ); } pub fn expand_all_hunk_diffs(&mut self, _: &ExpandAllHunkDiffs, cx: &mut ViewContext<Self>) { let snapshot = self.snapshot(cx); let display_rows_with_expanded_hunks = self .expanded_hunks .hunks(false) .map(|hunk| &hunk.hunk_range) .map(|anchor_range| { ( anchor_range .start .to_display_point(&snapshot.display_snapshot) .row(), anchor_range .end .to_display_point(&snapshot.display_snapshot) .row(), ) }) .collect::<HashMap<_, _>>(); let hunks = snapshot .display_snapshot .buffer_snapshot .git_diff_hunks_in_range(MultiBufferRow::MIN..MultiBufferRow::MAX) .filter(|hunk| { let hunk_display_row_range = Point::new(hunk.associated_range.start.0, 0) .to_display_point(&snapshot.display_snapshot) ..Point::new(hunk.associated_range.end.0, 0) .to_display_point(&snapshot.display_snapshot); let row_range_end = display_rows_with_expanded_hunks.get(&hunk_display_row_range.start.row()); row_range_end.is_none() || row_range_end != Some(&hunk_display_row_range.end.row()) }); self.toggle_hunks_expanded(hunks.collect(), cx); } fn toggle_hunks_expanded( &mut self, hunks_to_toggle: Vec<DiffHunk<MultiBufferRow>>, cx: &mut ViewContext<Self>, ) { let previous_toggle_task = self.expanded_hunks.hunk_update_tasks.remove(&None); let new_toggle_task = cx.spawn(move |editor, mut cx| async move { if let Some(task) = previous_toggle_task { task.await; } editor .update(&mut cx, |editor, cx| { let snapshot = editor.snapshot(cx); let mut hunks_to_toggle = hunks_to_toggle.into_iter().fuse().peekable(); let mut highlights_to_remove = Vec::with_capacity(editor.expanded_hunks.hunks.len()); let mut blocks_to_remove = HashSet::default(); let mut hunks_to_expand = Vec::new(); editor.expanded_hunks.hunks.retain(|expanded_hunk| { if expanded_hunk.folded { return true; } let expanded_hunk_row_range = expanded_hunk .hunk_range .start .to_display_point(&snapshot) .row() ..expanded_hunk .hunk_range .end .to_display_point(&snapshot) .row(); let mut retain = true; while let Some(hunk_to_toggle) = hunks_to_toggle.peek() { match diff_hunk_to_display(hunk_to_toggle, &snapshot) { DisplayDiffHunk::Folded { .. } => { hunks_to_toggle.next(); continue; } DisplayDiffHunk::Unfolded { diff_base_byte_range, display_row_range, multi_buffer_range, status, } => { let hunk_to_toggle_row_range = display_row_range; if hunk_to_toggle_row_range.start > expanded_hunk_row_range.end { break; } else if expanded_hunk_row_range == hunk_to_toggle_row_range { highlights_to_remove.push(expanded_hunk.hunk_range.clone()); blocks_to_remove.extend(expanded_hunk.block); hunks_to_toggle.next(); retain = false; break; } else { hunks_to_expand.push(HoveredHunk { status, multi_buffer_range, diff_base_byte_range, }); hunks_to_toggle.next(); continue; } } } } retain }); for remaining_hunk in hunks_to_toggle { let remaining_hunk_point_range = Point::new(remaining_hunk.associated_range.start.0, 0) ..Point::new(remaining_hunk.associated_range.end.0, 0); hunks_to_expand.push(HoveredHunk { status: hunk_status(&remaining_hunk), multi_buffer_range: remaining_hunk_point_range .to_anchors(&snapshot.buffer_snapshot), diff_base_byte_range: remaining_hunk.diff_base_byte_range.clone(), }); } for removed_rows in highlights_to_remove { editor.highlight_rows::<DiffRowHighlight>( to_inclusive_row_range(removed_rows, &snapshot), None, false, cx, ); } editor.remove_blocks(blocks_to_remove, None, cx); for hunk in hunks_to_expand { editor.expand_diff_hunk(None, &hunk, cx); } cx.notify(); }) .ok(); }); self.expanded_hunks .hunk_update_tasks .insert(None, cx.background_executor().spawn(new_toggle_task)); } pub(super) fn expand_diff_hunk( &mut self, diff_base_buffer: Option<Model<Buffer>>, hunk: &HoveredHunk, cx: &mut ViewContext<'_, Editor>, ) -> Option<()> { let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx); let multi_buffer_row_range = hunk .multi_buffer_range .start .to_point(&multi_buffer_snapshot) ..hunk.multi_buffer_range.end.to_point(&multi_buffer_snapshot); let hunk_start = hunk.multi_buffer_range.start; let hunk_end = hunk.multi_buffer_range.end; let buffer = self.buffer().clone(); let snapshot = self.snapshot(cx); let (diff_base_buffer, deleted_text_lines) = buffer.update(cx, |buffer, cx| { let hunk = buffer_diff_hunk(&snapshot.buffer_snapshot, multi_buffer_row_range.clone())?; let mut buffer_ranges = buffer.range_to_buffer_ranges(multi_buffer_row_range, cx); if buffer_ranges.len() == 1 { let (buffer, _, _) = buffer_ranges.pop()?; let diff_base_buffer = diff_base_buffer .or_else(|| self.current_diff_base_buffer(&buffer, cx)) .or_else(|| create_diff_base_buffer(&buffer, cx))?; let buffer = buffer.read(cx); let deleted_text_lines = buffer.diff_base().map(|diff_base| { let diff_start_row = diff_base .offset_to_point(hunk.diff_base_byte_range.start) .row; let diff_end_row = diff_base.offset_to_point(hunk.diff_base_byte_range.end).row; let line_count = diff_end_row - diff_start_row; line_count })?; Some((diff_base_buffer, deleted_text_lines)) } else { None } })?; let block_insert_index = match self.expanded_hunks.hunks.binary_search_by(|probe| { probe .hunk_range .start .cmp(&hunk_start, &multi_buffer_snapshot) }) { Ok(_already_present) => return None, Err(ix) => ix, }; let block = match hunk.status { DiffHunkStatus::Removed => { self.insert_deleted_text_block(diff_base_buffer, deleted_text_lines, &hunk, cx) } DiffHunkStatus::Added => { self.highlight_rows::<DiffRowHighlight>( to_inclusive_row_range(hunk_start..hunk_end, &snapshot), Some(added_hunk_color(cx)), false, cx, ); None } DiffHunkStatus::Modified => { self.highlight_rows::<DiffRowHighlight>( to_inclusive_row_range(hunk_start..hunk_end, &snapshot), Some(added_hunk_color(cx)), false, cx, ); self.insert_deleted_text_block(diff_base_buffer, deleted_text_lines, &hunk, cx) } }; self.expanded_hunks.hunks.insert( block_insert_index, ExpandedHunk { block, hunk_range: hunk_start..hunk_end, status: hunk.status, folded: false, diff_base_byte_range: hunk.diff_base_byte_range.clone(), }, ); Some(()) } fn insert_deleted_text_block( &mut self, diff_base_buffer: Model<Buffer>, deleted_text_height: u32, hunk: &HoveredHunk, cx: &mut ViewContext<'_, Self>, ) -> Option<CustomBlockId> { let deleted_hunk_color = deleted_hunk_color(cx); let (editor_height, editor_with_deleted_text) = editor_with_deleted_text(diff_base_buffer, deleted_hunk_color, hunk, cx); let editor = cx.view().clone(); let hunk = hunk.clone(); let height = editor_height.max(deleted_text_height); let mut new_block_ids = self.insert_blocks( Some(BlockProperties { position: hunk.multi_buffer_range.start, height, style: BlockStyle::Flex, disposition: BlockDisposition::Above, render: Box::new(move |cx| { let Some(gutter_bounds) = editor.read(cx).gutter_bounds() else { return div().into_any_element(); }; let (gutter_dimensions, hunk_bounds, close_button) = editor.update(cx.context, |editor, cx| { let editor_snapshot = editor.snapshot(cx); let hunk_display_range = hunk .multi_buffer_range .clone() .to_display_points(&editor_snapshot); let gutter_dimensions = editor.gutter_dimensions; let hunk_bounds = EditorElement::diff_hunk_bounds( &editor_snapshot, cx.line_height(), gutter_bounds, &DisplayDiffHunk::Unfolded { diff_base_byte_range: hunk.diff_base_byte_range.clone(), multi_buffer_range: hunk.multi_buffer_range.clone(), display_row_range: hunk_display_range.start.row() ..hunk_display_range.end.row(), status: hunk.status, }, ); let close_button = editor.close_hunk_diff_button( hunk.clone(), hunk_display_range.start.row(), cx, ); (gutter_dimensions, hunk_bounds, close_button) }); let click_editor = editor.clone(); let clicked_hunk = hunk.clone(); h_flex() .id("gutter with editor") .bg(deleted_hunk_color) .h(height as f32 * cx.line_height()) .w_full() .child( h_flex() .id("gutter") .max_w(gutter_dimensions.full_width()) .min_w(gutter_dimensions.full_width()) .size_full() .child( h_flex() .id("gutter hunk") .pl(gutter_dimensions.margin + gutter_dimensions .git_blame_entries_width .unwrap_or_default()) .max_w(hunk_bounds.size.width) .min_w(hunk_bounds.size.width) .size_full() .cursor(CursorStyle::PointingHand) .on_mouse_down(MouseButton::Left, { let click_hunk = hunk.clone(); move |e, cx| { let modifiers = e.modifiers; if modifiers.control || modifiers.platform { click_editor.update(cx, |editor, cx| { editor.toggle_hovered_hunk(&click_hunk, cx); }); } else { click_editor.update(cx, |editor, cx| { editor.open_hunk_context_menu( clicked_hunk.clone(), e.position, cx, ); }); } } }), ) .child( v_flex() .size_full() .pt(rems(0.25)) .justify_start() .child(close_button), ), ) .child(editor_with_deleted_text.clone()) .into_any_element()