Showing the changes to crates/buffer_diff/src/buffer_diff.rs (1 of 820 files). Show all
Unified · Split
| @@ -248,7 +248,7 @@ impl BufferDiffSnapshot { · 247 unmodified lines | ||
| 248 | 248 | self.inner.buffer_version() |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | − pub fn original_buffer_snapshot(&self) -> &text::BufferSnapshot { | |
| 251 | + fn original_buffer_snapshot(&self) -> &text::BufferSnapshot { | |
| 252 | 252 | &self.inner.buffer_snapshot |
| 253 | 253 | } |
| 254 | 254 | |
| @@ -914,28 +914,25 @@ impl BufferDiffInner<language::BufferSnapshot> { · 659 unmodified lines | ||
| 914 | 914 | buffer: &'a text::BufferSnapshot, |
| 915 | 915 | secondary: Option<&'a Self>, |
| 916 | 916 | ) -> impl 'a + Iterator<Item = DiffHunk> { |
| 917 | − let mut cursor = self.hunks.filter::<_, DiffHunkSummary>(buffer, filter); | |
| 918 | − | |
| 919 | − let anchor_iter = iter::from_fn(move || { | |
| 920 | − cursor.next(); | |
| 921 | − cursor.item() | |
| 922 | − }) | |
| 923 | − .flat_map(move |hunk| { | |
| 924 | − [ | |
| 925 | − ( | |
| 926 | − &hunk.buffer_range.start, | |
| 917 | + let anchor_iter = self | |
| 918 | + .hunks | |
| 919 | + .filter::<_, DiffHunkSummary>(buffer, filter) | |
| 920 | + .flat_map(move |hunk| { | |
| 921 | + [ | |
| 927 | 922 | ( |
| 928 | − hunk.buffer_range.start, | |
| 929 | − hunk.diff_base_byte_range.start, | |
| 930 | − hunk, | |
| 923 | + &hunk.buffer_range.start, | |
| 924 | + ( | |
| 925 | + hunk.buffer_range.start, | |
| 926 | + hunk.diff_base_byte_range.start, | |
| 927 | + hunk, | |
| 928 | + ), | |
| 931 | 929 | ), |
| 932 | − ), | |
| 933 | − ( | |
| 934 | − &hunk.buffer_range.end, | |
| 935 | − (hunk.buffer_range.end, hunk.diff_base_byte_range.end, hunk), | |
| 936 | − ), | |
| 937 | − ] | |
| 938 | − }); | |
| 930 | + ( | |
| 931 | + &hunk.buffer_range.end, | |
| 932 | + (hunk.buffer_range.end, hunk.diff_base_byte_range.end, hunk), | |
| 933 | + ), | |
| 934 | + ] | |
| 935 | + }); | |
| 939 | 936 | |
| 940 | 937 | let mut pending_hunks_cursor = self.pending_hunks.cursor::<DiffHunkSummary>(buffer); |
| 941 | 938 | pending_hunks_cursor.next(); |
| @@ -1979,8 +1976,8 @@ impl BufferDiff { · 1037 unmodified lines | ||
| 1979 | 1976 | cx.emit(BufferDiffEvent::DiffChanged(change)); |
| 1980 | 1977 | } |
| 1981 | 1978 | |
| 1982 | − pub fn base_text_buffer(&self) -> Entity<language::Buffer> { | |
| 1983 | − self.inner.base_text.clone() | |
| 1979 | + pub fn base_text_buffer(&self) -> &Entity<language::Buffer> { | |
| 1980 | + &self.inner.base_text | |
| 1984 | 1981 | } |
| 1985 | 1982 | } |
| 1986 | 1983 | |