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, v_flex, ActiveTheme, Context as _, ContextMenu, InteractiveElement, IntoElement,
17 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(hunk_bounds.origin.x)
488 .max_w(hunk_bounds.size.width)
489 .min_w(hunk_bounds.size.width)
490 .size_full()
491 .cursor(CursorStyle::PointingHand)
492 .on_mouse_down(MouseButton::Left, {
493 let click_hunk = hunk.clone();
494 move |e, cx| {
495 let modifiers = e.modifiers;
496 if modifiers.control || modifiers.platform {
497 click_editor.update(cx, |editor, cx| {
498 editor.toggle_hovered_hunk(&click_hunk, cx);
499 });
500 } else {
501 click_editor.update(cx, |editor, cx| {
502 editor.open_hunk_context_menu(
503 clicked_hunk.clone(),
504 e.position,
505 cx,
506 );
507 });
508 }
509 }
510 }),
511 )
512 .child(
513 v_flex()
514 .size_full()
515 .pt(ui::rems(0.25))
516 .justify_start()
517 .child(close_button),
518 ),
519 )
520 .child(editor_with_deleted_text.clone())
521 .into_any_element()
522 }),
523 }),
524 None,
525 cx,
526 );
527 if new_block_ids.len() == 1 {
528 new_block_ids.pop()
529 } else {
530 debug_panic!(
531 "Inserted one editor block but did not receive exactly one block id: {new_block_ids:?}"
532 );
533 None
534 }
535 }
536
537 pub(super) fn clear_clicked_diff_hunks(&mut self, cx: &mut ViewContext<'_, Editor>) -> bool {
538 self.expanded_hunks.hunk_update_tasks.clear();
539 self.clear_row_highlights::<DiffRowHighlight>();
540 let to_remove = self
541 .expanded_hunks
542 .hunks
543 .drain(..)
544 .filter_map(|expanded_hunk| expanded_hunk.block)
545 .collect::<HashSet<_>>();
546 if to_remove.is_empty() {
547 false
548 } else {
549 self.remove_blocks(to_remove, None, cx);
550 true
551 }
552 }
553
554 pub(super) fn sync_expanded_diff_hunks(
555 &mut self,
556 buffer: Model<Buffer>,
557 cx: &mut ViewContext<'_, Self>,
558 ) {
559 let buffer_id = buffer.read(cx).remote_id();
560 let buffer_diff_base_version = buffer.read(cx).diff_base_version();
561 self.expanded_hunks
562 .hunk_update_tasks
563 .remove(&Some(buffer_id));
564 let diff_base_buffer = self.current_diff_base_buffer(&buffer, cx);
565 let new_sync_task = cx.spawn(move |editor, mut cx| async move {
566 let diff_base_buffer_unchanged = diff_base_buffer.is_some();
567 let Ok(diff_base_buffer) =
568 cx.update(|cx| diff_base_buffer.or_else(|| create_diff_base_buffer(&buffer, cx)))
569 else {
570 return;
571 };
572 editor
573 .update(&mut cx, |editor, cx| {
574 if let Some(diff_base_buffer) = &diff_base_buffer {
575 editor.expanded_hunks.diff_base.insert(
576 buffer_id,
577 DiffBaseBuffer {
578 buffer: diff_base_buffer.clone(),
579 diff_base_version: buffer_diff_base_version,
580 },
581 );
582 }
583
584 let snapshot = editor.snapshot(cx);
585 let mut recalculated_hunks = snapshot
586 .buffer_snapshot
587 .git_diff_hunks_in_range(MultiBufferRow::MIN..MultiBufferRow::MAX)
588 .filter(|hunk| hunk.buffer_id == buffer_id)
589 .fuse()
590 .peekable();
591 let mut highlights_to_remove =
592 Vec::with_capacity(editor.expanded_hunks.hunks.len());
593 let mut blocks_to_remove = HashSet::default();
594 let mut hunks_to_reexpand =
595 Vec::with_capacity(editor.expanded_hunks.hunks.len());
596 editor.expanded_hunks.hunks.retain_mut(|expanded_hunk| {
597 if expanded_hunk.hunk_range.start.buffer_id != Some(buffer_id) {
598 return true;
599 };
600
601 let mut retain = false;
602 if diff_base_buffer_unchanged {
603 let expanded_hunk_display_range = expanded_hunk
604 .hunk_range
605 .start
606 .to_display_point(&snapshot)
607 .row()
608 ..expanded_hunk
609 .hunk_range
610 .end
611 .to_display_point(&snapshot)
612 .row();
613 while let Some(buffer_hunk) = recalculated_hunks.peek() {
614 match diff_hunk_to_display(&buffer_hunk, &snapshot) {
615 DisplayDiffHunk::Folded { display_row } => {
616 recalculated_hunks.next();
617 if !expanded_hunk.folded
618 && expanded_hunk_display_range
619 .to_inclusive()
620 .contains(&display_row)
621 {
622 retain = true;
623 expanded_hunk.folded = true;
624 highlights_to_remove
625 .push(expanded_hunk.hunk_range.clone());
626 if let Some(block) = expanded_hunk.block.take() {
627 blocks_to_remove.insert(block);
628 }
629 break;
630 } else {
631 continue;
632 }
633 }
634 DisplayDiffHunk::Unfolded {
635 diff_base_byte_range,
636 display_row_range,
637 multi_buffer_range,
638 status,
639 } => {
640 let hunk_display_range = display_row_range;
641 if expanded_hunk_display_range.start
642 > hunk_display_range.end
643 {
644 recalculated_hunks.next();
645 continue;
646 } else if expanded_hunk_display_range.end
647 < hunk_display_range.start
648 {
649 break;
650 } else {
651 if !expanded_hunk.folded
652 && expanded_hunk_display_range == hunk_display_range
653 && expanded_hunk.status == hunk_status(buffer_hunk)
654 && expanded_hunk.diff_base_byte_range
655 == buffer_hunk.diff_base_byte_range
656 {
657 recalculated_hunks.next();
658 retain = true;
659 } else {
660 hunks_to_reexpand.push(HoveredHunk {
661 status,
662 multi_buffer_range,
663 diff_base_byte_range,
664 });
665 }
666 break;
667 }
668 }
669 }
670 }
671 }
672 if !retain {
673 blocks_to_remove.extend(expanded_hunk.block);
674 highlights_to_remove.push(expanded_hunk.hunk_range.clone());
675 }
676 retain
677 });
678
679 for removed_rows in highlights_to_remove {
680 editor.highlight_rows::<DiffRowHighlight>(
681 to_inclusive_row_range(removed_rows, &snapshot),
682 None,
683 false,
684 cx,
685 );
686 }
687 editor.remove_blocks(blocks_to_remove, None, cx);
688
689 if let Some(diff_base_buffer) = &diff_base_buffer {
690 for hunk in hunks_to_reexpand {
691 editor.expand_diff_hunk(Some(diff_base_buffer.clone()), &hunk, cx);
692 }
693 }
694 })
695 .ok();
696 });
697
698 self.expanded_hunks.hunk_update_tasks.insert(
699 Some(buffer_id),
700 cx.background_executor().spawn(new_sync_task),
701 );
702 }
703
704 fn current_diff_base_buffer(
705 &mut self,
706 buffer: &Model<Buffer>,
707 cx: &mut AppContext,
708 ) -> Option<Model<Buffer>> {
709 buffer.update(cx, |buffer, _| {
710 match self.expanded_hunks.diff_base.entry(buffer.remote_id()) {
711 hash_map::Entry::Occupied(o) => {
712 if o.get().diff_base_version != buffer.diff_base_version() {
713 o.remove();
714 None
715 } else {
716 Some(o.get().buffer.clone())
717 }
718 }
719 hash_map::Entry::Vacant(_) => None,
720 }
721 })
722 }
723}
724
725fn to_diff_hunk(
726 hovered_hunk: &HoveredHunk,
727 multi_buffer_snapshot: &MultiBufferSnapshot,
728) -> Option<DiffHunk<MultiBufferRow>> {
729 let buffer_id = hovered_hunk
730 .multi_buffer_range
731 .start
732 .buffer_id
733 .or_else(|| hovered_hunk.multi_buffer_range.end.buffer_id)?;
734 let buffer_range = hovered_hunk.multi_buffer_range.start.text_anchor
735 ..hovered_hunk.multi_buffer_range.end.text_anchor;
736 let point_range = hovered_hunk
737 .multi_buffer_range
738 .to_point(&multi_buffer_snapshot);
739 Some(DiffHunk {
740 associated_range: MultiBufferRow(point_range.start.row)
741 ..MultiBufferRow(point_range.end.row),
742 buffer_id,
743 buffer_range,
744 diff_base_byte_range: hovered_hunk.diff_base_byte_range.clone(),
745 })
746}
747
748fn create_diff_base_buffer(buffer: &Model<Buffer>, cx: &mut AppContext) -> Option<Model<Buffer>> {
749 buffer
750 .update(cx, |buffer, _| {
751 let language = buffer.language().cloned();
752 let diff_base = buffer.diff_base()?.clone();
753 Some((buffer.line_ending(), diff_base, language))
754 })
755 .map(|(line_ending, diff_base, language)| {
756 cx.new_model(|cx| {
757 let buffer = Buffer::local_normalized(diff_base, line_ending, cx);
758 match language {
759 Some(language) => buffer.with_language(language, cx),
760 None => buffer,
761 }
762 })
763 })
764}
765
766fn added_hunk_color(cx: &AppContext) -> Hsla {
767 let mut created_color = cx.theme().status().git().created;
768 created_color.fade_out(0.7);
769 created_color
770}
771
772fn deleted_hunk_color(cx: &AppContext) -> Hsla {
773 let mut deleted_color = cx.theme().status().git().deleted;
774 deleted_color.fade_out(0.7);
775 deleted_color
776}
777
778fn editor_with_deleted_text(
779 diff_base_buffer: Model<Buffer>,
780 deleted_color: Hsla,
781 hunk: &HoveredHunk,
782 cx: &mut ViewContext<'_, Editor>,
783) -> (u8, View<Editor>) {
784 let parent_editor = cx.view().downgrade();
785 let editor = cx.new_view(|cx| {
786 let multi_buffer =
787 cx.new_model(|_| MultiBuffer::without_headers(0, language::Capability::ReadOnly));
788 multi_buffer.update(cx, |multi_buffer, cx| {
789 multi_buffer.push_excerpts(
790 diff_base_buffer,
791 Some(ExcerptRange {
792 context: hunk.diff_base_byte_range.clone(),
793 primary: None,
794 }),
795 cx,
796 );
797 });
798
799 let mut editor = Editor::for_multibuffer(multi_buffer, None, true, cx);
800 editor.soft_wrap_mode_override = Some(language::language_settings::SoftWrap::None);
801 editor.show_wrap_guides = Some(false);
802 editor.show_gutter = false;
803 editor.scroll_manager.set_forbid_vertical_scroll(true);
804 editor.set_read_only(true);
805
806 let editor_snapshot = editor.snapshot(cx);
807 let start = editor_snapshot.buffer_snapshot.anchor_before(0);
808 let end = editor_snapshot
809 .buffer_snapshot
810 .anchor_after(editor.buffer.read(cx).len(cx));
811
812 editor.highlight_rows::<DiffRowHighlight>(start..=end, Some(deleted_color), false, cx);
813
814 let subscription_editor = parent_editor.clone();
815 editor._subscriptions.extend([
816 cx.on_blur(&editor.focus_handle, |editor, cx| {
817 editor.set_current_line_highlight(Some(CurrentLineHighlight::None));
818 editor.change_selections(None, cx, |s| {
819 s.try_cancel();
820 });
821 cx.notify();
822 }),
823 cx.on_focus(&editor.focus_handle, move |editor, cx| {
824 let restored_highlight = if let Some(parent_editor) = subscription_editor.upgrade()
825 {
826 parent_editor.read(cx).current_line_highlight
827 } else {
828 None
829 };
830 editor.set_current_line_highlight(restored_highlight);
831 cx.notify();
832 }),
833 cx.observe_global::<SettingsStore>(|editor, cx| {
834 if !editor.is_focused(cx) {
835 editor.set_current_line_highlight(Some(CurrentLineHighlight::None));
836 }
837 }),
838 ]);
839 let parent_editor_for_reverts = parent_editor.clone();
840 let original_multi_buffer_range = hunk.multi_buffer_range.clone();
841 let diff_base_range = hunk.diff_base_byte_range.clone();
842 editor
843 .register_action::<RevertSelectedHunks>(move |_, cx| {
844 parent_editor_for_reverts
845 .update(cx, |editor, cx| {
846 let Some((buffer, original_text)) =
847 editor.buffer().update(cx, |buffer, cx| {
848 let (_, buffer, _) = buffer
849 .excerpt_containing(original_multi_buffer_range.start, cx)?;
850 let original_text =
851 buffer.read(cx).diff_base()?.slice(diff_base_range.clone());
852 Some((buffer, Arc::from(original_text.to_string())))
853 })
854 else {
855 return;
856 };
857 buffer.update(cx, |buffer, cx| {
858 buffer.edit(
859 Some((
860 original_multi_buffer_range.start.text_anchor
861 ..original_multi_buffer_range.end.text_anchor,
862 original_text,
863 )),
864 None,
865 cx,
866 )
867 });
868 })
869 .ok();
870 })
871 .detach();
872 let hunk = hunk.clone();
873 editor
874 .register_action::<ToggleHunkDiff>(move |_, cx| {
875 parent_editor
876 .update(cx, |editor, cx| {
877 editor.toggle_hovered_hunk(&hunk, cx);
878 })
879 .ok();
880 })
881 .detach();
882 editor
883 });
884
885 let editor_height = editor.update(cx, |editor, cx| editor.max_point(cx).row().0 as u8);
886 (editor_height, editor)
887}
888
889fn buffer_diff_hunk(
890 buffer_snapshot: &MultiBufferSnapshot,
891 row_range: Range<Point>,
892) -> Option<DiffHunk<MultiBufferRow>> {
893 let mut hunks = buffer_snapshot.git_diff_hunks_in_range(
894 MultiBufferRow(row_range.start.row)..MultiBufferRow(row_range.end.row),
895 );
896 let hunk = hunks.next()?;
897 let second_hunk = hunks.next();
898 if second_hunk.is_none() {
899 return Some(hunk);
900 }
901 None
902}
903
904fn to_inclusive_row_range(
905 row_range: Range<Anchor>,
906 snapshot: &EditorSnapshot,
907) -> RangeInclusive<Anchor> {
908 let mut display_row_range =
909 row_range.start.to_display_point(snapshot)..row_range.end.to_display_point(snapshot);
910 if display_row_range.end.row() > display_row_range.start.row() {
911 *display_row_range.end.row_mut() -= 1;
912 }
913 let point_range = display_row_range.start.to_point(&snapshot.display_snapshot)
914 ..display_row_range.end.to_point(&snapshot.display_snapshot);
915 let new_range = point_range.to_anchors(&snapshot.buffer_snapshot);
916 new_range.start..=new_range.end
917}