Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reset buffer git diff when setting diff base to None

Browse source 
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
This commit is contained in:
Julia 2022-10-07 12:20:54 -04:00
parent 8fb8fff61b
commit e15f27106d
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/git/src/diff.rs
View file

@ -104,6 +104,11 @@ impl BufferDiff {
}) })
} }
pub fn clear(&mut self, buffer: &text::BufferSnapshot) {
self.last_buffer_version = Some(buffer.version().clone());
self.tree = SumTree::new();
}
pub fn needs_update(&self, buffer: &text::BufferSnapshot) -> bool { pub fn needs_update(&self, buffer: &text::BufferSnapshot) -> bool {
match &self.last_buffer_version { match &self.last_buffer_version {
Some(last) => buffer.version().changed_since(last), Some(last) => buffer.version().changed_since(last),
@ -296,6 +301,9 @@ mod tests {
&diff_base, &diff_base,
&[(0..1, "", "point five\n"), (2..3, "two\n", "HELLO\n")], &[(0..1, "", "point five\n"), (2..3, "two\n", "HELLO\n")],
); );
diff.clear(&buffer);
assert_hunks(diff.hunks(&buffer), &buffer, &diff_base, &[]);
} }
#[test] #[test]

5
crates/language/src/buffer.rs
View file

@ -707,6 +707,11 @@ impl Buffer {
} }
}) })
.detach() .detach()
} else {
let snapshot = self.snapshot();
self.git_diff_status.diff.clear(&snapshot);
self.git_diff_update_count += 1;
cx.notify();
} }
} }