hunk_diff.rs

  1use std::{
  2    ops::{Range, RangeInclusive},
  3    sync::Arc,
  4};
  5
  6use collections::{hash_map, HashMap, HashSet};
  7use git::diff::{DiffHunk, DiffHunkStatus};
  8use gpui::{AppContext, Hsla, Model, Task, View};
  9use language::Buffer;
 10use multi_buffer::{Anchor, ExcerptRange, MultiBuffer, MultiBufferSnapshot, ToPoint};
 11use text::{BufferId, Point};
 12use ui::{
 13    div, ActiveTheme, Context as _, IntoElement, ParentElement, Styled, ViewContext, VisualContext,
 14};
 15use util::{debug_panic, RangeExt};
 16
 17use crate::{
 18    git::{diff_hunk_to_display, DisplayDiffHunk},
 19    hunks_for_selections, BlockDisposition, BlockId, BlockProperties, BlockStyle, DiffRowHighlight,
 20    Editor, EditorSnapshot, ExpandAllHunkDiffs, RangeToAnchorExt, RevertSelectedHunks,
 21    ToDisplayPoint, ToggleHunkDiff,
 22};
 23
 24#[derive(Debug, Clone)]
 25pub(super) struct HunkToExpand {
 26    pub multi_buffer_range: Range<Anchor>,
 27    pub status: DiffHunkStatus,
 28    pub diff_base_byte_range: Range<usize>,
 29}
 30
 31#[derive(Debug, Default)]
 32pub(super) struct ExpandedHunks {
 33    hunks: Vec<ExpandedHunk>,
 34    diff_base: HashMap<BufferId, DiffBaseBuffer>,
 35    hunk_update_tasks: HashMap<Option<BufferId>, Task<()>>,
 36}
 37
 38#[derive(Debug)]
 39struct DiffBaseBuffer {
 40    buffer: Model<Buffer>,
 41    diff_base_version: usize,
 42}
 43
 44impl ExpandedHunks {
 45    pub fn hunks(&self, include_folded: bool) -> impl Iterator<Item = &ExpandedHunk> {
 46        self.hunks
 47            .iter()
 48            .filter(move |hunk| include_folded || !hunk.folded)
 49    }
 50}
 51
 52#[derive(Debug, Clone)]
 53pub(super) struct ExpandedHunk {
 54    pub block: Option<BlockId>,
 55    pub hunk_range: Range<Anchor>,
 56    pub diff_base_byte_range: Range<usize>,
 57    pub status: DiffHunkStatus,
 58    pub folded: bool,
 59}
 60
 61impl Editor {
 62    pub fn toggle_hunk_diff(&mut self, _: &ToggleHunkDiff, cx: &mut ViewContext<Self>) {
 63        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
 64        let selections = self.selections.disjoint_anchors();
 65        self.toggle_hunks_expanded(
 66            hunks_for_selections(&multi_buffer_snapshot, &selections),
 67            cx,
 68        );
 69    }
 70
 71    pub fn expand_all_hunk_diffs(&mut self, _: &ExpandAllHunkDiffs, cx: &mut ViewContext<Self>) {
 72        let snapshot = self.snapshot(cx);
 73        let display_rows_with_expanded_hunks = self
 74            .expanded_hunks
 75            .hunks(false)
 76            .map(|hunk| &hunk.hunk_range)
 77            .map(|anchor_range| {
 78                (
 79                    anchor_range
 80                        .start
 81                        .to_display_point(&snapshot.display_snapshot)
 82                        .row(),
 83                    anchor_range
 84                        .end
 85                        .to_display_point(&snapshot.display_snapshot)
 86                        .row(),
 87                )
 88            })
 89            .collect::<HashMap<_, _>>();
 90        let hunks = snapshot
 91            .display_snapshot
 92            .buffer_snapshot
 93            .git_diff_hunks_in_range(0..u32::MAX)
 94            .filter(|hunk| {
 95                let hunk_display_row_range = Point::new(hunk.associated_range.start, 0)
 96                    .to_display_point(&snapshot.display_snapshot)
 97                    ..Point::new(hunk.associated_range.end, 0)
 98                        .to_display_point(&snapshot.display_snapshot);
 99                let row_range_end =
100                    display_rows_with_expanded_hunks.get(&hunk_display_row_range.start.row());
101                row_range_end.is_none() || row_range_end != Some(&hunk_display_row_range.end.row())
102            });
103        self.toggle_hunks_expanded(hunks.collect(), cx);
104    }
105
106    fn toggle_hunks_expanded(
107        &mut self,
108        hunks_to_toggle: Vec<DiffHunk<u32>>,
109        cx: &mut ViewContext<Self>,
110    ) {
111        let previous_toggle_task = self.expanded_hunks.hunk_update_tasks.remove(&None);
112        let new_toggle_task = cx.spawn(move |editor, mut cx| async move {
113            if let Some(task) = previous_toggle_task {
114                task.await;
115            }
116
117            editor
118                .update(&mut cx, |editor, cx| {
119                    let snapshot = editor.snapshot(cx);
120                    let mut hunks_to_toggle = hunks_to_toggle.into_iter().fuse().peekable();
121                    let mut highlights_to_remove =
122                        Vec::with_capacity(editor.expanded_hunks.hunks.len());
123                    let mut blocks_to_remove = HashSet::default();
124                    let mut hunks_to_expand = Vec::new();
125                    editor.expanded_hunks.hunks.retain(|expanded_hunk| {
126                        if expanded_hunk.folded {
127                            return true;
128                        }
129                        let expanded_hunk_row_range = expanded_hunk
130                            .hunk_range
131                            .start
132                            .to_display_point(&snapshot)
133                            .row()
134                            ..expanded_hunk
135                                .hunk_range
136                                .end
137                                .to_display_point(&snapshot)
138                                .row();
139                        let mut retain = true;
140                        while let Some(hunk_to_toggle) = hunks_to_toggle.peek() {
141                            match diff_hunk_to_display(hunk_to_toggle, &snapshot) {
142                                DisplayDiffHunk::Folded { .. } => {
143                                    hunks_to_toggle.next();
144                                    continue;
145                                }
146                                DisplayDiffHunk::Unfolded {
147                                    diff_base_byte_range,
148                                    display_row_range,
149                                    multi_buffer_range,
150                                    status,
151                                } => {
152                                    let hunk_to_toggle_row_range = display_row_range;
153                                    if hunk_to_toggle_row_range.start > expanded_hunk_row_range.end
154                                    {
155                                        break;
156                                    } else if expanded_hunk_row_range == hunk_to_toggle_row_range {
157                                        highlights_to_remove.push(expanded_hunk.hunk_range.clone());
158                                        blocks_to_remove.extend(expanded_hunk.block);
159                                        hunks_to_toggle.next();
160                                        retain = false;
161                                        break;
162                                    } else {
163                                        hunks_to_expand.push(HunkToExpand {
164                                            status,
165                                            multi_buffer_range,
166                                            diff_base_byte_range,
167                                        });
168                                        hunks_to_toggle.next();
169                                        continue;
170                                    }
171                                }
172                            }
173                        }
174
175                        retain
176                    });
177                    for remaining_hunk in hunks_to_toggle {
178                        let remaining_hunk_point_range =
179                            Point::new(remaining_hunk.associated_range.start, 0)
180                                ..Point::new(remaining_hunk.associated_range.end, 0);
181                        hunks_to_expand.push(HunkToExpand {
182                            status: remaining_hunk.status(),
183                            multi_buffer_range: remaining_hunk_point_range
184                                .to_anchors(&snapshot.buffer_snapshot),
185                            diff_base_byte_range: remaining_hunk.diff_base_byte_range.clone(),
186                        });
187                    }
188
189                    for removed_rows in highlights_to_remove {
190                        editor.highlight_rows::<DiffRowHighlight>(
191                            to_inclusive_row_range(removed_rows, &snapshot),
192                            None,
193                            cx,
194                        );
195                    }
196                    editor.remove_blocks(blocks_to_remove, None, cx);
197                    for hunk in hunks_to_expand {
198                        editor.expand_diff_hunk(None, &hunk, cx);
199                    }
200                    cx.notify();
201                })
202                .ok();
203        });
204
205        self.expanded_hunks
206            .hunk_update_tasks
207            .insert(None, cx.background_executor().spawn(new_toggle_task));
208    }
209
210    pub(super) fn expand_diff_hunk(
211        &mut self,
212        diff_base_buffer: Option<Model<Buffer>>,
213        hunk: &HunkToExpand,
214        cx: &mut ViewContext<'_, Editor>,
215    ) -> Option<()> {
216        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
217        let multi_buffer_row_range = hunk
218            .multi_buffer_range
219            .start
220            .to_point(&multi_buffer_snapshot)
221            ..hunk.multi_buffer_range.end.to_point(&multi_buffer_snapshot);
222        let hunk_start = hunk.multi_buffer_range.start;
223        let hunk_end = hunk.multi_buffer_range.end;
224
225        let buffer = self.buffer().clone();
226        let snapshot = self.snapshot(cx);
227        let (diff_base_buffer, deleted_text_lines) = buffer.update(cx, |buffer, cx| {
228            let hunk = buffer_diff_hunk(&snapshot.buffer_snapshot, multi_buffer_row_range.clone())?;
229            let mut buffer_ranges = buffer.range_to_buffer_ranges(multi_buffer_row_range, cx);
230            if buffer_ranges.len() == 1 {
231                let (buffer, _, _) = buffer_ranges.pop()?;
232                let diff_base_buffer = diff_base_buffer
233                    .or_else(|| self.current_diff_base_buffer(&buffer, cx))
234                    .or_else(|| create_diff_base_buffer(&buffer, cx))?;
235                let buffer = buffer.read(cx);
236                let deleted_text_lines = buffer.diff_base().map(|diff_base| {
237                    let diff_start_row = diff_base
238                        .offset_to_point(hunk.diff_base_byte_range.start)
239                        .row;
240                    let diff_end_row = diff_base.offset_to_point(hunk.diff_base_byte_range.end).row;
241                    let line_count = diff_end_row - diff_start_row;
242                    line_count as u8
243                })?;
244                Some((diff_base_buffer, deleted_text_lines))
245            } else {
246                None
247            }
248        })?;
249
250        let block_insert_index = match self.expanded_hunks.hunks.binary_search_by(|probe| {
251            probe
252                .hunk_range
253                .start
254                .cmp(&hunk_start, &multi_buffer_snapshot)
255        }) {
256            Ok(_already_present) => return None,
257            Err(ix) => ix,
258        };
259
260        let block = match hunk.status {
261            DiffHunkStatus::Removed => {
262                self.insert_deleted_text_block(diff_base_buffer, deleted_text_lines, &hunk, cx)
263            }
264            DiffHunkStatus::Added => {
265                self.highlight_rows::<DiffRowHighlight>(
266                    to_inclusive_row_range(hunk_start..hunk_end, &snapshot),
267                    Some(added_hunk_color(cx)),
268                    cx,
269                );
270                None
271            }
272            DiffHunkStatus::Modified => {
273                self.highlight_rows::<DiffRowHighlight>(
274                    to_inclusive_row_range(hunk_start..hunk_end, &snapshot),
275                    Some(added_hunk_color(cx)),
276                    cx,
277                );
278                self.insert_deleted_text_block(diff_base_buffer, deleted_text_lines, &hunk, cx)
279            }
280        };
281        if hunk_start.cmp(&hunk_end, &multi_buffer_snapshot).is_gt() {
282            eprintln!("@######################!!!!!!!!!!!!!");
283        };
284        self.expanded_hunks.hunks.insert(
285            block_insert_index,
286            ExpandedHunk {
287                block,
288                hunk_range: hunk_start..hunk_end,
289                status: hunk.status,
290                folded: false,
291                diff_base_byte_range: hunk.diff_base_byte_range.clone(),
292            },
293        );
294
295        Some(())
296    }
297
298    fn insert_deleted_text_block(
299        &mut self,
300        diff_base_buffer: Model<Buffer>,
301        deleted_text_height: u8,
302        hunk: &HunkToExpand,
303        cx: &mut ViewContext<'_, Self>,
304    ) -> Option<BlockId> {
305        let deleted_hunk_color = deleted_hunk_color(cx);
306        let (editor_height, editor_with_deleted_text) =
307            editor_with_deleted_text(diff_base_buffer, deleted_hunk_color, hunk, cx);
308        let parent_gutter_offset = self.gutter_dimensions.width + self.gutter_dimensions.margin;
309        let mut new_block_ids = self.insert_blocks(
310            Some(BlockProperties {
311                position: hunk.multi_buffer_range.start,
312                height: editor_height.max(deleted_text_height),
313                style: BlockStyle::Flex,
314                render: Box::new(move |_| {
315                    div()
316                        .bg(deleted_hunk_color)
317                        .size_full()
318                        .pl(parent_gutter_offset)
319                        .child(editor_with_deleted_text.clone())
320                        .into_any_element()
321                }),
322                disposition: BlockDisposition::Above,
323            }),
324            None,
325            cx,
326        );
327        if new_block_ids.len() == 1 {
328            new_block_ids.pop()
329        } else {
330            debug_panic!(
331                "Inserted one editor block but did not receive exactly one block id: {new_block_ids:?}"
332            );
333            None
334        }
335    }
336
337    pub(super) fn clear_expanded_diff_hunks(&mut self, cx: &mut ViewContext<'_, Editor>) {
338        self.expanded_hunks.hunk_update_tasks.clear();
339        let to_remove = self
340            .expanded_hunks
341            .hunks
342            .drain(..)
343            .filter_map(|expanded_hunk| expanded_hunk.block)
344            .collect();
345        self.clear_row_highlights::<DiffRowHighlight>();
346        self.remove_blocks(to_remove, None, cx);
347    }
348
349    pub(super) fn sync_expanded_diff_hunks(
350        &mut self,
351        buffer: Model<Buffer>,
352        cx: &mut ViewContext<'_, Self>,
353    ) {
354        let buffer_id = buffer.read(cx).remote_id();
355        let buffer_diff_base_version = buffer.read(cx).diff_base_version();
356        self.expanded_hunks
357            .hunk_update_tasks
358            .remove(&Some(buffer_id));
359        let diff_base_buffer = self.current_diff_base_buffer(&buffer, cx);
360        let new_sync_task = cx.spawn(move |editor, mut cx| async move {
361            let diff_base_buffer_unchanged = diff_base_buffer.is_some();
362            let Ok(diff_base_buffer) =
363                cx.update(|cx| diff_base_buffer.or_else(|| create_diff_base_buffer(&buffer, cx)))
364            else {
365                return;
366            };
367            editor
368                .update(&mut cx, |editor, cx| {
369                    if let Some(diff_base_buffer) = &diff_base_buffer {
370                        editor.expanded_hunks.diff_base.insert(
371                            buffer_id,
372                            DiffBaseBuffer {
373                                buffer: diff_base_buffer.clone(),
374                                diff_base_version: buffer_diff_base_version,
375                            },
376                        );
377                    }
378
379                    let snapshot = editor.snapshot(cx);
380                    let buffer_snapshot = buffer.read(cx).snapshot();
381                    let mut recalculated_hunks = buffer_snapshot
382                        .git_diff_hunks_in_row_range(0..u32::MAX)
383                        .fuse()
384                        .peekable();
385                    let mut highlights_to_remove =
386                        Vec::with_capacity(editor.expanded_hunks.hunks.len());
387                    let mut blocks_to_remove = HashSet::default();
388                    let mut hunks_to_reexpand =
389                        Vec::with_capacity(editor.expanded_hunks.hunks.len());
390                    editor.expanded_hunks.hunks.retain_mut(|expanded_hunk| {
391                        if expanded_hunk.hunk_range.start.buffer_id != Some(buffer_id) {
392                            return true;
393                        };
394
395                        let mut retain = false;
396                        if diff_base_buffer_unchanged {
397                            let expanded_hunk_display_range = expanded_hunk
398                                .hunk_range
399                                .start
400                                .to_display_point(&snapshot)
401                                .row()
402                                ..expanded_hunk
403                                    .hunk_range
404                                    .end
405                                    .to_display_point(&snapshot)
406                                    .row();
407                            while let Some(buffer_hunk) = recalculated_hunks.peek() {
408                                match diff_hunk_to_display(buffer_hunk, &snapshot) {
409                                    DisplayDiffHunk::Folded { display_row } => {
410                                        recalculated_hunks.next();
411                                        if !expanded_hunk.folded
412                                            && expanded_hunk_display_range
413                                                .to_inclusive()
414                                                .contains(&display_row)
415                                        {
416                                            retain = true;
417                                            expanded_hunk.folded = true;
418                                            highlights_to_remove
419                                                .push(expanded_hunk.hunk_range.clone());
420                                            if let Some(block) = expanded_hunk.block.take() {
421                                                blocks_to_remove.insert(block);
422                                            }
423                                            break;
424                                        } else {
425                                            continue;
426                                        }
427                                    }
428                                    DisplayDiffHunk::Unfolded {
429                                        diff_base_byte_range,
430                                        display_row_range,
431                                        multi_buffer_range,
432                                        status,
433                                    } => {
434                                        let hunk_display_range = display_row_range;
435                                        if expanded_hunk_display_range.start
436                                            > hunk_display_range.end
437                                        {
438                                            recalculated_hunks.next();
439                                            continue;
440                                        } else if expanded_hunk_display_range.end
441                                            < hunk_display_range.start
442                                        {
443                                            break;
444                                        } else {
445                                            if !expanded_hunk.folded
446                                                && expanded_hunk_display_range == hunk_display_range
447                                                && expanded_hunk.status == buffer_hunk.status()
448                                                && expanded_hunk.diff_base_byte_range
449                                                    == buffer_hunk.diff_base_byte_range
450                                            {
451                                                recalculated_hunks.next();
452                                                retain = true;
453                                            } else {
454                                                hunks_to_reexpand.push(HunkToExpand {
455                                                    status,
456                                                    multi_buffer_range,
457                                                    diff_base_byte_range,
458                                                });
459                                            }
460                                            break;
461                                        }
462                                    }
463                                }
464                            }
465                        }
466                        if !retain {
467                            blocks_to_remove.extend(expanded_hunk.block);
468                            highlights_to_remove.push(expanded_hunk.hunk_range.clone());
469                        }
470                        retain
471                    });
472
473                    for removed_rows in highlights_to_remove {
474                        editor.highlight_rows::<DiffRowHighlight>(
475                            to_inclusive_row_range(removed_rows, &snapshot),
476                            None,
477                            cx,
478                        );
479                    }
480                    editor.remove_blocks(blocks_to_remove, None, cx);
481
482                    if let Some(diff_base_buffer) = &diff_base_buffer {
483                        for hunk in hunks_to_reexpand {
484                            editor.expand_diff_hunk(Some(diff_base_buffer.clone()), &hunk, cx);
485                        }
486                    }
487                })
488                .ok();
489        });
490
491        self.expanded_hunks.hunk_update_tasks.insert(
492            Some(buffer_id),
493            cx.background_executor().spawn(new_sync_task),
494        );
495    }
496
497    fn current_diff_base_buffer(
498        &mut self,
499        buffer: &Model<Buffer>,
500        cx: &mut AppContext,
501    ) -> Option<Model<Buffer>> {
502        buffer.update(cx, |buffer, _| {
503            match self.expanded_hunks.diff_base.entry(buffer.remote_id()) {
504                hash_map::Entry::Occupied(o) => {
505                    if o.get().diff_base_version != buffer.diff_base_version() {
506                        o.remove();
507                        None
508                    } else {
509                        Some(o.get().buffer.clone())
510                    }
511                }
512                hash_map::Entry::Vacant(_) => None,
513            }
514        })
515    }
516}
517
518fn create_diff_base_buffer(buffer: &Model<Buffer>, cx: &mut AppContext) -> Option<Model<Buffer>> {
519    buffer
520        .update(cx, |buffer, _| {
521            let language = buffer.language().cloned();
522            let diff_base = buffer.diff_base()?.clone();
523            Some((buffer.line_ending(), diff_base, language))
524        })
525        .map(|(line_ending, diff_base, language)| {
526            cx.new_model(|cx| {
527                let buffer = Buffer::local_normalized(diff_base, line_ending, cx);
528                match language {
529                    Some(language) => buffer.with_language(language, cx),
530                    None => buffer,
531                }
532            })
533        })
534}
535
536fn added_hunk_color(cx: &AppContext) -> Hsla {
537    let mut created_color = cx.theme().status().git().created;
538    created_color.fade_out(0.7);
539    created_color
540}
541
542fn deleted_hunk_color(cx: &AppContext) -> Hsla {
543    let mut deleted_color = cx.theme().status().git().deleted;
544    deleted_color.fade_out(0.7);
545    deleted_color
546}
547
548fn editor_with_deleted_text(
549    diff_base_buffer: Model<Buffer>,
550    deleted_color: Hsla,
551    hunk: &HunkToExpand,
552    cx: &mut ViewContext<'_, Editor>,
553) -> (u8, View<Editor>) {
554    let parent_editor = cx.view().downgrade();
555    let editor = cx.new_view(|cx| {
556        let multi_buffer =
557            cx.new_model(|_| MultiBuffer::without_headers(0, language::Capability::ReadOnly));
558        multi_buffer.update(cx, |multi_buffer, cx| {
559            multi_buffer.push_excerpts(
560                diff_base_buffer,
561                Some(ExcerptRange {
562                    context: hunk.diff_base_byte_range.clone(),
563                    primary: None,
564                }),
565                cx,
566            );
567        });
568
569        let mut editor = Editor::for_multibuffer(multi_buffer, None, cx);
570        editor.soft_wrap_mode_override = Some(language::language_settings::SoftWrap::None);
571        editor.show_wrap_guides = Some(false);
572        editor.show_gutter = false;
573        editor.scroll_manager.set_forbid_vertical_scroll(true);
574        editor.set_read_only(true);
575
576        let editor_snapshot = editor.snapshot(cx);
577        let start = editor_snapshot.buffer_snapshot.anchor_before(0);
578        let end = editor_snapshot
579            .buffer_snapshot
580            .anchor_after(editor.buffer.read(cx).len(cx));
581
582        editor.highlight_rows::<DiffRowHighlight>(start..=end, Some(deleted_color), cx);
583        let hunk_related_subscription = cx.on_blur(&editor.focus_handle, |editor, cx| {
584            editor.change_selections(None, cx, |s| {
585                s.try_cancel();
586            });
587        });
588        editor._subscriptions.push(hunk_related_subscription);
589        let original_multi_buffer_range = hunk.multi_buffer_range.clone();
590        let diff_base_range = hunk.diff_base_byte_range.clone();
591        editor.register_action::<RevertSelectedHunks>(move |_, cx| {
592            parent_editor
593                .update(cx, |editor, cx| {
594                    let Some((buffer, original_text)) = editor.buffer().update(cx, |buffer, cx| {
595                        let (_, buffer, _) =
596                            buffer.excerpt_containing(original_multi_buffer_range.start, cx)?;
597                        let original_text =
598                            buffer.read(cx).diff_base()?.slice(diff_base_range.clone());
599                        Some((buffer, Arc::from(original_text.to_string())))
600                    }) else {
601                        return;
602                    };
603                    buffer.update(cx, |buffer, cx| {
604                        buffer.edit(
605                            Some((
606                                original_multi_buffer_range.start.text_anchor
607                                    ..original_multi_buffer_range.end.text_anchor,
608                                original_text,
609                            )),
610                            None,
611                            cx,
612                        )
613                    });
614                })
615                .ok();
616        });
617        editor
618    });
619
620    let editor_height = editor.update(cx, |editor, cx| editor.max_point(cx).row() as u8);
621    (editor_height, editor)
622}
623
624fn buffer_diff_hunk(
625    buffer_snapshot: &MultiBufferSnapshot,
626    row_range: Range<Point>,
627) -> Option<DiffHunk<u32>> {
628    let mut hunks = buffer_snapshot.git_diff_hunks_in_range(row_range.start.row..row_range.end.row);
629    let hunk = hunks.next()?;
630    let second_hunk = hunks.next();
631    if second_hunk.is_none() {
632        return Some(hunk);
633    }
634    None
635}
636
637fn to_inclusive_row_range(
638    row_range: Range<Anchor>,
639    snapshot: &EditorSnapshot,
640) -> RangeInclusive<Anchor> {
641    let mut display_row_range =
642        row_range.start.to_display_point(snapshot)..row_range.end.to_display_point(snapshot);
643    if display_row_range.end.row() > display_row_range.start.row() {
644        *display_row_range.end.row_mut() -= 1;
645    }
646    let point_range = display_row_range.start.to_point(&snapshot.display_snapshot)
647        ..display_row_range.end.to_point(&snapshot.display_snapshot);
648    let new_range = point_range.to_anchors(&snapshot.buffer_snapshot);
649    new_range.start..=new_range.end
650}