1use std::{
2 ops::{Range, RangeInclusive},
3 sync::Arc,
4};
5
6use collections::{hash_map, HashMap, HashSet};
7use git::diff::{DiffHunk, DiffHunkStatus};
8use gpui::{Action, AppContext, CursorStyle, Hsla, Model, MouseButton, Subscription, Task, View};
9use language::Buffer;
10use multi_buffer::{
11 Anchor, AnchorRangeExt, ExcerptRange, MultiBuffer, MultiBufferRow, MultiBufferSnapshot, ToPoint,
12};
13use settings::SettingsStore;
14use text::{BufferId, Point};
15use ui::{
16 div, h_flex, rems, v_flex, ActiveTheme, Context as _, ContextMenu, InteractiveElement,
17 IntoElement, ParentElement, Pixels, Styled, ViewContext, VisualContext,
18};
19use util::{debug_panic, RangeExt};
20
21use crate::{
22 editor_settings::CurrentLineHighlight,
23 git::{diff_hunk_to_display, DisplayDiffHunk},
24 hunk_status, hunks_for_selections,
25 mouse_context_menu::MouseContextMenu,
26 BlockDisposition, BlockProperties, BlockStyle, CustomBlockId, DiffRowHighlight, Editor,
27 EditorElement, EditorSnapshot, ExpandAllHunkDiffs, RangeToAnchorExt, RevertSelectedHunks,
28 ToDisplayPoint, ToggleHunkDiff,
29};
30
31#[derive(Debug, Clone)]
32pub(super) struct HoveredHunk {
33 pub multi_buffer_range: Range<Anchor>,
34 pub status: DiffHunkStatus,
35 pub diff_base_byte_range: Range<usize>,
36}
37
38#[derive(Debug, Default)]
39pub(super) struct ExpandedHunks {
40 hunks: Vec<ExpandedHunk>,
41 diff_base: HashMap<BufferId, DiffBaseBuffer>,
42 hunk_update_tasks: HashMap<Option<BufferId>, Task<()>>,
43}
44
45#[derive(Debug)]
46struct DiffBaseBuffer {
47 buffer: Model<Buffer>,
48 diff_base_version: usize,
49}
50
51impl ExpandedHunks {
52 pub fn hunks(&self, include_folded: bool) -> impl Iterator<Item = &ExpandedHunk> {
53 self.hunks
54 .iter()
55 .filter(move |hunk| include_folded || !hunk.folded)
56 }
57}
58
59#[derive(Debug, Clone)]
60pub(super) struct ExpandedHunk {
61 pub block: Option<CustomBlockId>,
62 pub hunk_range: Range<Anchor>,
63 pub diff_base_byte_range: Range<usize>,
64 pub status: DiffHunkStatus,
65 pub folded: bool,
66}
67
68impl Editor {
69 pub(super) fn open_hunk_context_menu(
70 &mut self,
71 hovered_hunk: HoveredHunk,
72 clicked_point: gpui::Point<Pixels>,
73 cx: &mut ViewContext<Editor>,
74 ) {
75 let focus_handle = self.focus_handle.clone();
76 let expanded = self
77 .expanded_hunks
78 .hunks(false)
79 .any(|expanded_hunk| expanded_hunk.hunk_range == hovered_hunk.multi_buffer_range);
80 let editor_handle = cx.view().clone();
81 let editor_snapshot = self.snapshot(cx);
82 let start_point = self
83 .to_pixel_point(hovered_hunk.multi_buffer_range.start, &editor_snapshot, cx)
84 .unwrap_or(clicked_point);
85 let end_point = self
86 .to_pixel_point(hovered_hunk.multi_buffer_range.start, &editor_snapshot, cx)
87 .unwrap_or(clicked_point);
88 let norm =
89 |a: gpui::Point<Pixels>, b: gpui::Point<Pixels>| (a.x - b.x).abs() + (a.y - b.y).abs();
90 let closest_source = if norm(start_point, clicked_point) < norm(end_point, clicked_point) {
91 hovered_hunk.multi_buffer_range.start
92 } else {
93 hovered_hunk.multi_buffer_range.end
94 };
95
96 self.mouse_context_menu = MouseContextMenu::pinned_to_editor(
97 self,
98 closest_source,
99 clicked_point,
100 ContextMenu::build(cx, move |menu, _| {
101 menu.on_blur_subscription(Subscription::new(|| {}))
102 .context(focus_handle)
103 .entry(
104 if expanded {
105 "Collapse Hunk"
106 } else {
107 "Expand Hunk"
108 },
109 Some(ToggleHunkDiff.boxed_clone()),
110 {
111 let editor = editor_handle.clone();
112 let hunk = hovered_hunk.clone();
113 move |cx| {
114 editor.update(cx, |editor, cx| {
115 editor.toggle_hovered_hunk(&hunk, cx);
116 });
117 }
118 },
119 )
120 .entry("Revert Hunk", Some(RevertSelectedHunks.boxed_clone()), {
121 let editor = editor_handle.clone();
122 let hunk = hovered_hunk.clone();
123 move |cx| {
124 let multi_buffer = editor.read(cx).buffer().clone();
125 let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx);
126 let mut revert_changes = HashMap::default();
127 if let Some(hunk) =
128 crate::hunk_diff::to_diff_hunk(&hunk, &multi_buffer_snapshot)
129 {
130 Editor::prepare_revert_change(
131 &mut revert_changes,
132 &multi_buffer,
133 &hunk,
134 cx,
135 );
136 }
137 if !revert_changes.is_empty() {
138 editor.update(cx, |editor, cx| editor.revert(revert_changes, cx));
139 }
140 }
141 })
142 .entry("Revert File", None, {
143 let editor = editor_handle.clone();
144 move |cx| {
145 let mut revert_changes = HashMap::default();
146 let multi_buffer = editor.read(cx).buffer().clone();
147 let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx);
148 for hunk in crate::hunks_for_rows(
149 Some(MultiBufferRow(0)..multi_buffer_snapshot.max_buffer_row())
150 .into_iter(),
151 &multi_buffer_snapshot,
152 ) {
153 Editor::prepare_revert_change(
154 &mut revert_changes,
155 &multi_buffer,
156 &hunk,
157 cx,
158 );
159 }
160 if !revert_changes.is_empty() {
161 editor.update(cx, |editor, cx| {
162 editor.transact(cx, |editor, cx| {
163 editor.revert(revert_changes, cx);
164 });
165 });
166 }
167 }
168 })
169 }),
170 cx,
171 )
172 }
173
174 pub(super) fn toggle_hovered_hunk(
175 &mut self,
176 hovered_hunk: &HoveredHunk,
177 cx: &mut ViewContext<Editor>,
178 ) {
179 let editor_snapshot = self.snapshot(cx);
180 if let Some(diff_hunk) = to_diff_hunk(hovered_hunk, &editor_snapshot.buffer_snapshot) {
181 self.toggle_hunks_expanded(vec![diff_hunk], cx);
182 self.change_selections(None, cx, |selections| selections.refresh());
183 }
184 }
185
186 pub fn toggle_hunk_diff(&mut self, _: &ToggleHunkDiff, cx: &mut ViewContext<Self>) {
187 let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
188 let selections = self.selections.disjoint_anchors();
189 self.toggle_hunks_expanded(
190 hunks_for_selections(&multi_buffer_snapshot, &selections),
191 cx,
192 );
193 }
194
195 pub fn expand_all_hunk_diffs(&mut self, _: &ExpandAllHunkDiffs, cx: &mut ViewContext<Self>) {
196 let snapshot = self.snapshot(cx);
197 let display_rows_with_expanded_hunks = self
198 .expanded_hunks
199 .hunks(false)
200 .map(|hunk| &hunk.hunk_range)
201 .map(|anchor_range| {
202 (
203 anchor_range
204 .start
205 .to_display_point(&snapshot.display_snapshot)
206 .row(),
207 anchor_range
208 .end
209 .to_display_point(&snapshot.display_snapshot)
210 .row(),
211 )
212 })
213 .collect::<HashMap<_, _>>();
214 let hunks = snapshot
215 .display_snapshot
216 .buffer_snapshot
217 .git_diff_hunks_in_range(MultiBufferRow::MIN..MultiBufferRow::MAX)
218 .filter(|hunk| {
219 let hunk_display_row_range = Point::new(hunk.associated_range.start.0, 0)
220 .to_display_point(&snapshot.display_snapshot)
221 ..Point::new(hunk.associated_range.end.0, 0)
222 .to_display_point(&snapshot.display_snapshot);
223 let row_range_end =
224 display_rows_with_expanded_hunks.get(&hunk_display_row_range.start.row());
225 row_range_end.is_none() || row_range_end != Some(&hunk_display_row_range.end.row())
226 });
227 self.toggle_hunks_expanded(hunks.collect(), cx);
228 }
229
230 fn toggle_hunks_expanded(
231 &mut self,
232 hunks_to_toggle: Vec<DiffHunk<MultiBufferRow>>,
233 cx: &mut ViewContext<Self>,
234 ) {
235 let previous_toggle_task = self.expanded_hunks.hunk_update_tasks.remove(&None);
236 let new_toggle_task = cx.spawn(move |editor, mut cx| async move {
237 if let Some(task) = previous_toggle_task {
238 task.await;
239 }
240
241 editor
242 .update(&mut cx, |editor, cx| {
243 let snapshot = editor.snapshot(cx);
244 let mut hunks_to_toggle = hunks_to_toggle.into_iter().fuse().peekable();
245 let mut highlights_to_remove =
246 Vec::with_capacity(editor.expanded_hunks.hunks.len());
247 let mut blocks_to_remove = HashSet::default();
248 let mut hunks_to_expand = Vec::new();
249 editor.expanded_hunks.hunks.retain(|expanded_hunk| {
250 if expanded_hunk.folded {
251 return true;
252 }
253 let expanded_hunk_row_range = expanded_hunk
254 .hunk_range
255 .start
256 .to_display_point(&snapshot)
257 .row()
258 ..expanded_hunk
259 .hunk_range
260 .end
261 .to_display_point(&snapshot)
262 .row();
263 let mut retain = true;
264 while let Some(hunk_to_toggle) = hunks_to_toggle.peek() {
265 match diff_hunk_to_display(hunk_to_toggle, &snapshot) {
266 DisplayDiffHunk::Folded { .. } => {
267 hunks_to_toggle.next();
268 continue;
269 }
270 DisplayDiffHunk::Unfolded {
271 diff_base_byte_range,
272 display_row_range,
273 multi_buffer_range,
274 status,
275 } => {
276 let hunk_to_toggle_row_range = display_row_range;
277 if hunk_to_toggle_row_range.start > expanded_hunk_row_range.end
278 {
279 break;
280 } else if expanded_hunk_row_range == hunk_to_toggle_row_range {
281 highlights_to_remove.push(expanded_hunk.hunk_range.clone());
282 blocks_to_remove.extend(expanded_hunk.block);
283 hunks_to_toggle.next();
284 retain = false;
285 break;
286 } else {
287 hunks_to_expand.push(HoveredHunk {
288 status,
289 multi_buffer_range,
290 diff_base_byte_range,
291 });
292 hunks_to_toggle.next();
293 continue;
294 }
295 }
296 }
297 }
298
299 retain
300 });
301 for remaining_hunk in hunks_to_toggle {
302 let remaining_hunk_point_range =
303 Point::new(remaining_hunk.associated_range.start.0, 0)
304 ..Point::new(remaining_hunk.associated_range.end.0, 0);
305 hunks_to_expand.push(HoveredHunk {
306 status: hunk_status(&remaining_hunk),
307 multi_buffer_range: remaining_hunk_point_range
308 .to_anchors(&snapshot.buffer_snapshot),
309 diff_base_byte_range: remaining_hunk.diff_base_byte_range.clone(),
310 });
311 }
312
313 for removed_rows in highlights_to_remove {
314 editor.highlight_rows::<DiffRowHighlight>(
315 to_inclusive_row_range(removed_rows, &snapshot),
316 None,
317 false,
318 cx,
319 );
320 }
321 editor.remove_blocks(blocks_to_remove, None, cx);
322 for hunk in hunks_to_expand {
323 editor.expand_diff_hunk(None, &hunk, cx);
324 }
325 cx.notify();
326 })
327 .ok();
328 });
329
330 self.expanded_hunks
331 .hunk_update_tasks
332 .insert(None, cx.background_executor().spawn(new_toggle_task));
333 }
334
335 pub(super) fn expand_diff_hunk(
336 &mut self,
337 diff_base_buffer: Option<Model<Buffer>>,
338 hunk: &HoveredHunk,
339 cx: &mut ViewContext<'_, Editor>,
340 ) -> Option<()> {
341 let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
342 let multi_buffer_row_range = hunk
343 .multi_buffer_range
344 .start
345 .to_point(&multi_buffer_snapshot)
346 ..hunk.multi_buffer_range.end.to_point(&multi_buffer_snapshot);
347 let hunk_start = hunk.multi_buffer_range.start;
348 let hunk_end = hunk.multi_buffer_range.end;
349
350 let buffer = self.buffer().clone();
351 let snapshot = self.snapshot(cx);
352 let (diff_base_buffer, deleted_text_lines) = buffer.update(cx, |buffer, cx| {
353 let hunk = buffer_diff_hunk(&snapshot.buffer_snapshot, multi_buffer_row_range.clone())?;
354 let mut buffer_ranges = buffer.range_to_buffer_ranges(multi_buffer_row_range, cx);
355 if buffer_ranges.len() == 1 {
356 let (buffer, _, _) = buffer_ranges.pop()?;
357 let diff_base_buffer = diff_base_buffer
358 .or_else(|| self.current_diff_base_buffer(&buffer, cx))
359 .or_else(|| create_diff_base_buffer(&buffer, cx))?;
360 let buffer = buffer.read(cx);
361 let deleted_text_lines = buffer.diff_base().map(|diff_base| {
362 let diff_start_row = diff_base
363 .offset_to_point(hunk.diff_base_byte_range.start)
364 .row;
365 let diff_end_row = diff_base.offset_to_point(hunk.diff_base_byte_range.end).row;
366 let line_count = diff_end_row - diff_start_row;
367 line_count as u8
368 })?;
369 Some((diff_base_buffer, deleted_text_lines))
370 } else {
371 None
372 }
373 })?;
374
375 let block_insert_index = match self.expanded_hunks.hunks.binary_search_by(|probe| {
376 probe
377 .hunk_range
378 .start
379 .cmp(&hunk_start, &multi_buffer_snapshot)
380 }) {
381 Ok(_already_present) => return None,
382 Err(ix) => ix,
383 };
384
385 let block = match hunk.status {
386 DiffHunkStatus::Removed => {
387 self.insert_deleted_text_block(diff_base_buffer, deleted_text_lines, &hunk, cx)
388 }
389 DiffHunkStatus::Added => {
390 self.highlight_rows::<DiffRowHighlight>(
391 to_inclusive_row_range(hunk_start..hunk_end, &snapshot),
392 Some(added_hunk_color(cx)),
393 false,
394 cx,
395 );
396 None
397 }
398 DiffHunkStatus::Modified => {
399 self.highlight_rows::<DiffRowHighlight>(
400 to_inclusive_row_range(hunk_start..hunk_end, &snapshot),
401 Some(added_hunk_color(cx)),
402 false,
403 cx,
404 );
405 self.insert_deleted_text_block(diff_base_buffer, deleted_text_lines, &hunk, cx)
406 }
407 };
408 self.expanded_hunks.hunks.insert(
409 block_insert_index,
410 ExpandedHunk {
411 block,
412 hunk_range: hunk_start..hunk_end,
413 status: hunk.status,
414 folded: false,
415 diff_base_byte_range: hunk.diff_base_byte_range.clone(),
416 },
417 );
418
419 Some(())
420 }
421
422 fn insert_deleted_text_block(
423 &mut self,
424 diff_base_buffer: Model<Buffer>,
425 deleted_text_height: u8,
426 hunk: &HoveredHunk,
427 cx: &mut ViewContext<'_, Self>,
428 ) -> Option<CustomBlockId> {
429 let deleted_hunk_color = deleted_hunk_color(cx);
430 let (editor_height, editor_with_deleted_text) =
431 editor_with_deleted_text(diff_base_buffer, deleted_hunk_color, hunk, cx);
432 let editor = cx.view().clone();
433 let hunk = hunk.clone();
434 let mut new_block_ids = self.insert_blocks(
435 Some(BlockProperties {
436 position: hunk.multi_buffer_range.start,
437 height: editor_height.max(deleted_text_height),
438 style: BlockStyle::Flex,
439 disposition: BlockDisposition::Above,
440 render: Box::new(move |cx| {
441 let Some(gutter_bounds) = editor.read(cx).gutter_bounds() else {
442 return div().into_any_element();
443 };
444 let (gutter_dimensions, hunk_bounds, close_button) =
445 editor.update(cx.context, |editor, cx| {
446 let editor_snapshot = editor.snapshot(cx);
447 let hunk_display_range = hunk
448 .multi_buffer_range
449 .clone()
450 .to_display_points(&editor_snapshot);
451 let gutter_dimensions = editor.gutter_dimensions;
452 let hunk_bounds = EditorElement::diff_hunk_bounds(
453 &editor_snapshot,
454 cx.line_height(),
455 gutter_bounds,
456 &DisplayDiffHunk::Unfolded {
457 diff_base_byte_range: hunk.diff_base_byte_range.clone(),
458 multi_buffer_range: hunk.multi_buffer_range.clone(),
459 display_row_range: hunk_display_range.start.row()
460 ..hunk_display_range.end.row(),
461 status: hunk.status,
462 },
463 );
464
465 let close_button = editor.close_hunk_diff_button(
466 hunk.clone(),
467 hunk_display_range.start.row(),
468 cx,
469 );
470 (gutter_dimensions, hunk_bounds, close_button)
471 });
472 let click_editor = editor.clone();
473 let clicked_hunk = hunk.clone();
474 h_flex()
475 .id("gutter with editor")
476 .bg(deleted_hunk_color)
477 .size_full()
478 .child(
479 h_flex()
480 .id("gutter")
481 .max_w(gutter_dimensions.full_width())
482 .min_w(gutter_dimensions.full_width())
483 .size_full()
484 .child(
485 h_flex()
486 .id("gutter hunk")
487 .pl(gutter_dimensions.margin
488 + gutter_dimensions
489 .git_blame_entries_width
490 .unwrap_or_default())
491 .max_w(hunk_bounds.size.width)
492 .min_w(hunk_bounds.size.width)
493 .size_full()
494 .cursor(CursorStyle::PointingHand)
495 .on_mouse_down(MouseButton::Left, {
496 let click_hunk = hunk.clone();
497 move |e, cx| {
498 let modifiers = e.modifiers;
499 if modifiers.control || modifiers.platform {
500 click_editor.update(cx, |editor, cx| {
501 editor.toggle_hovered_hunk(&click_hunk, cx);
502 });
503 } else {
504 click_editor.update(cx, |editor, cx| {
505 editor.open_hunk_context_menu(
506 clicked_hunk.clone(),
507 e.position,
508 cx,
509 );
510 });
511 }
512 }
513 }),
514 )
515 .child(
516 v_flex()
517 .size_full()
518 .pt(rems(0.25))
519 .justify_start()
520 .child(close_button),
521 ),
522 )
523 .child(editor_with_deleted_text.clone())
524 .into_any_element()
525 }),
526 }),
527 None,
528 cx,
529 );
530 if new_block_ids.len() == 1 {
531 new_block_ids.pop()
532 } else {
533 debug_panic!(
534 "Inserted one editor block but did not receive exactly one block id: {new_block_ids:?}"
535 );
536 None
537 }
538 }
539
540 pub(super) fn clear_clicked_diff_hunks(&mut self, cx: &mut ViewContext<'_, Editor>) -> bool {
541 self.expanded_hunks.hunk_update_tasks.clear();
542 self.clear_row_highlights::<DiffRowHighlight>();
543 let to_remove = self
544 .expanded_hunks
545 .hunks
546 .drain(..)
547 .filter_map(|expanded_hunk| expanded_hunk.block)
548 .collect::<HashSet<_>>();
549 if to_remove.is_empty() {
550 false
551 } else {
552 self.remove_blocks(to_remove, None, cx);
553 true
554 }
555 }
556
557 pub(super) fn sync_expanded_diff_hunks(
558 &mut self,
559 buffer: Model<Buffer>,
560 cx: &mut ViewContext<'_, Self>,
561 ) {
562 let buffer_id = buffer.read(cx).remote_id();
563 let buffer_diff_base_version = buffer.read(cx).diff_base_version();
564 self.expanded_hunks
565 .hunk_update_tasks
566 .remove(&Some(buffer_id));
567 let diff_base_buffer = self.current_diff_base_buffer(&buffer, cx);
568 let new_sync_task = cx.spawn(move |editor, mut cx| async move {
569 let diff_base_buffer_unchanged = diff_base_buffer.is_some();
570 let Ok(diff_base_buffer) =
571 cx.update(|cx| diff_base_buffer.or_else(|| create_diff_base_buffer(&buffer, cx)))
572 else {
573 return;
574 };
575 editor
576 .update(&mut cx, |editor, cx| {
577 if let Some(diff_base_buffer) = &diff_base_buffer {
578 editor.expanded_hunks.diff_base.insert(
579 buffer_id,
580 DiffBaseBuffer {
581 buffer: diff_base_buffer.clone(),
582 diff_base_version: buffer_diff_base_version,
583 },
584 );
585 }
586
587 let snapshot = editor.snapshot(cx);
588 let mut recalculated_hunks = snapshot
589 .buffer_snapshot
590 .git_diff_hunks_in_range(MultiBufferRow::MIN..MultiBufferRow::MAX)
591 .filter(|hunk| hunk.buffer_id == buffer_id)
592 .fuse()
593 .peekable();
594 let mut highlights_to_remove =
595 Vec::with_capacity(editor.expanded_hunks.hunks.len());
596 let mut blocks_to_remove = HashSet::default();
597 let mut hunks_to_reexpand =
598 Vec::with_capacity(editor.expanded_hunks.hunks.len());
599 editor.expanded_hunks.hunks.retain_mut(|expanded_hunk| {
600 if expanded_hunk.hunk_range.start.buffer_id != Some(buffer_id) {
601 return true;
602 };
603
604 let mut retain = false;
605 if diff_base_buffer_unchanged {
606 let expanded_hunk_display_range = expanded_hunk
607 .hunk_range
608 .start
609 .to_display_point(&snapshot)
610 .row()
611 ..expanded_hunk
612 .hunk_range
613 .end
614 .to_display_point(&snapshot)
615 .row();
616 while let Some(buffer_hunk) = recalculated_hunks.peek() {
617 match diff_hunk_to_display(&buffer_hunk, &snapshot) {
618 DisplayDiffHunk::Folded { display_row } => {
619 recalculated_hunks.next();
620 if !expanded_hunk.folded
621 && expanded_hunk_display_range
622 .to_inclusive()
623 .contains(&display_row)
624 {
625 retain = true;
626 expanded_hunk.folded = true;
627 highlights_to_remove
628 .push(expanded_hunk.hunk_range.clone());
629 if let Some(block) = expanded_hunk.block.take() {
630 blocks_to_remove.insert(block);
631 }
632 break;
633 } else {
634 continue;
635 }
636 }
637 DisplayDiffHunk::Unfolded {
638 diff_base_byte_range,
639 display_row_range,
640 multi_buffer_range,
641 status,
642 } => {
643 let hunk_display_range = display_row_range;
644 if expanded_hunk_display_range.start
645 > hunk_display_range.end
646 {
647 recalculated_hunks.next();
648 continue;
649 } else if expanded_hunk_display_range.end
650 < hunk_display_range.start
651 {
652 break;
653 } else {
654 if !expanded_hunk.folded
655 && expanded_hunk_display_range == hunk_display_range
656 && expanded_hunk.status == hunk_status(buffer_hunk)
657 && expanded_hunk.diff_base_byte_range
658 == buffer_hunk.diff_base_byte_range
659 {
660 recalculated_hunks.next();
661 retain = true;
662 } else {
663 hunks_to_reexpand.push(HoveredHunk {
664 status,
665 multi_buffer_range,
666 diff_base_byte_range,
667 });
668 }
669 break;
670 }
671 }
672 }
673 }
674 }
675 if !retain {
676 blocks_to_remove.extend(expanded_hunk.block);
677 highlights_to_remove.push(expanded_hunk.hunk_range.clone());
678 }
679 retain
680 });
681
682 for removed_rows in highlights_to_remove {
683 editor.highlight_rows::<DiffRowHighlight>(
684 to_inclusive_row_range(removed_rows, &snapshot),
685 None,
686 false,
687 cx,
688 );
689 }
690 editor.remove_blocks(blocks_to_remove, None, cx);
691
692 if let Some(diff_base_buffer) = &diff_base_buffer {
693 for hunk in hunks_to_reexpand {
694 editor.expand_diff_hunk(Some(diff_base_buffer.clone()), &hunk, cx);
695 }
696 }
697 })
698 .ok();
699 });
700
701 self.expanded_hunks.hunk_update_tasks.insert(
702 Some(buffer_id),
703 cx.background_executor().spawn(new_sync_task),
704 );
705 }
706
707 fn current_diff_base_buffer(
708 &mut self,
709 buffer: &Model<Buffer>,
710 cx: &mut AppContext,
711 ) -> Option<Model<Buffer>> {
712 buffer.update(cx, |buffer, _| {
713 match self.expanded_hunks.diff_base.entry(buffer.remote_id()) {
714 hash_map::Entry::Occupied(o) => {
715 if o.get().diff_base_version != buffer.diff_base_version() {
716 o.remove();
717 None
718 } else {
719 Some(o.get().buffer.clone())
720 }
721 }
722 hash_map::Entry::Vacant(_) => None,
723 }
724 })
725 }
726}
727
728fn to_diff_hunk(
729 hovered_hunk: &HoveredHunk,
730 multi_buffer_snapshot: &MultiBufferSnapshot,
731) -> Option<DiffHunk<MultiBufferRow>> {
732 let buffer_id = hovered_hunk
733 .multi_buffer_range
734 .start
735 .buffer_id
736 .or_else(|| hovered_hunk.multi_buffer_range.end.buffer_id)?;
737 let buffer_range = hovered_hunk.multi_buffer_range.start.text_anchor
738 ..hovered_hunk.multi_buffer_range.end.text_anchor;
739 let point_range = hovered_hunk
740 .multi_buffer_range
741 .to_point(&multi_buffer_snapshot);
742 Some(DiffHunk {
743 associated_range: MultiBufferRow(point_range.start.row)
744 ..MultiBufferRow(point_range.end.row),
745 buffer_id,
746 buffer_range,
747 diff_base_byte_range: hovered_hunk.diff_base_byte_range.clone(),
748 })
749}
750
751fn create_diff_base_buffer(buffer: &Model<Buffer>, cx: &mut AppContext) -> Option<Model<Buffer>> {
752 buffer
753 .update(cx, |buffer, _| {
754 let language = buffer.language().cloned();
755 let diff_base = buffer.diff_base()?.clone();
756 Some((buffer.line_ending(), diff_base, language))
757 })
758 .map(|(line_ending, diff_base, language)| {
759 cx.new_model(|cx| {
760 let buffer = Buffer::local_normalized(diff_base, line_ending, cx);
761 match language {
762 Some(language) => buffer.with_language(language, cx),
763 None => buffer,
764 }
765 })
766 })
767}
768
769fn added_hunk_color(cx: &AppContext) -> Hsla {
770 let mut created_color = cx.theme().status().git().created;
771 created_color.fade_out(0.7);
772 created_color
773}
774
775fn deleted_hunk_color(cx: &AppContext) -> Hsla {
776 let mut deleted_color = cx.theme().status().git().deleted;
777 deleted_color.fade_out(0.7);
778 deleted_color
779}
780
781fn editor_with_deleted_text(
782 diff_base_buffer: Model<Buffer>,
783 deleted_color: Hsla,
784 hunk: &HoveredHunk,
785 cx: &mut ViewContext<'_, Editor>,
786) -> (u8, View<Editor>) {
787 let parent_editor = cx.view().downgrade();
788 let editor = cx.new_view(|cx| {
789 let multi_buffer =
790 cx.new_model(|_| MultiBuffer::without_headers(0, language::Capability::ReadOnly));
791 multi_buffer.update(cx, |multi_buffer, cx| {
792 multi_buffer.push_excerpts(
793 diff_base_buffer,
794 Some(ExcerptRange {
795 context: hunk.diff_base_byte_range.clone(),
796 primary: None,
797 }),
798 cx,
799 );
800 });
801
802 let mut editor = Editor::for_multibuffer(multi_buffer, None, true, cx);
803 editor.soft_wrap_mode_override = Some(language::language_settings::SoftWrap::None);
804 editor.show_wrap_guides = Some(false);
805 editor.show_gutter = false;
806 editor.scroll_manager.set_forbid_vertical_scroll(true);
807 editor.set_read_only(true);
808
809 let editor_snapshot = editor.snapshot(cx);
810 let start = editor_snapshot.buffer_snapshot.anchor_before(0);
811 let end = editor_snapshot
812 .buffer_snapshot
813 .anchor_after(editor.buffer.read(cx).len(cx));
814
815 editor.highlight_rows::<DiffRowHighlight>(start..=end, Some(deleted_color), false, cx);
816
817 let subscription_editor = parent_editor.clone();
818 editor._subscriptions.extend([
819 cx.on_blur(&editor.focus_handle, |editor, cx| {
820 editor.set_current_line_highlight(Some(CurrentLineHighlight::None));
821 editor.change_selections(None, cx, |s| {
822 s.try_cancel();
823 });
824 cx.notify();
825 }),
826 cx.on_focus(&editor.focus_handle, move |editor, cx| {
827 let restored_highlight = if let Some(parent_editor) = subscription_editor.upgrade()
828 {
829 parent_editor.read(cx).current_line_highlight
830 } else {
831 None
832 };
833 editor.set_current_line_highlight(restored_highlight);
834 cx.notify();
835 }),
836 cx.observe_global::<SettingsStore>(|editor, cx| {
837 if !editor.is_focused(cx) {
838 editor.set_current_line_highlight(Some(CurrentLineHighlight::None));
839 }
840 }),
841 ]);
842 let parent_editor_for_reverts = parent_editor.clone();
843 let original_multi_buffer_range = hunk.multi_buffer_range.clone();
844 let diff_base_range = hunk.diff_base_byte_range.clone();
845 editor
846 .register_action::<RevertSelectedHunks>(move |_, cx| {
847 parent_editor_for_reverts
848 .update(cx, |editor, cx| {
849 let Some((buffer, original_text)) =
850 editor.buffer().update(cx, |buffer, cx| {
851 let (_, buffer, _) = buffer
852 .excerpt_containing(original_multi_buffer_range.start, cx)?;
853 let original_text =
854 buffer.read(cx).diff_base()?.slice(diff_base_range.clone());
855 Some((buffer, Arc::from(original_text.to_string())))
856 })
857 else {
858 return;
859 };
860 buffer.update(cx, |buffer, cx| {
861 buffer.edit(
862 Some((
863 original_multi_buffer_range.start.text_anchor
864 ..original_multi_buffer_range.end.text_anchor,
865 original_text,
866 )),
867 None,
868 cx,
869 )
870 });
871 })
872 .ok();
873 })
874 .detach();
875 let hunk = hunk.clone();
876 editor
877 .register_action::<ToggleHunkDiff>(move |_, cx| {
878 parent_editor
879 .update(cx, |editor, cx| {
880 editor.toggle_hovered_hunk(&hunk, cx);
881 })
882 .ok();
883 })
884 .detach();
885 editor
886 });
887
888 let editor_height = editor.update(cx, |editor, cx| editor.max_point(cx).row().0 as u8);
889 (editor_height, editor)
890}
891
892fn buffer_diff_hunk(
893 buffer_snapshot: &MultiBufferSnapshot,
894 row_range: Range<Point>,
895) -> Option<DiffHunk<MultiBufferRow>> {
896 let mut hunks = buffer_snapshot.git_diff_hunks_in_range(
897 MultiBufferRow(row_range.start.row)..MultiBufferRow(row_range.end.row),
898 );
899 let hunk = hunks.next()?;
900 let second_hunk = hunks.next();
901 if second_hunk.is_none() {
902 return Some(hunk);
903 }
904 None
905}
906
907fn to_inclusive_row_range(
908 row_range: Range<Anchor>,
909 snapshot: &EditorSnapshot,
910) -> RangeInclusive<Anchor> {
911 let mut display_row_range =
912 row_range.start.to_display_point(snapshot)..row_range.end.to_display_point(snapshot);
913 if display_row_range.end.row() > display_row_range.start.row() {
914 *display_row_range.end.row_mut() -= 1;
915 }
916 let point_range = display_row_range.start.to_point(&snapshot.display_snapshot)
917 ..display_row_range.end.to_point(&snapshot.display_snapshot);
918 let new_range = point_range.to_anchors(&snapshot.buffer_snapshot);
919 new_range.start..=new_range.end
920}