Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

git_ui: Enable navigation for single-hunk diffs (#62615)

Ayushd0bfe0a4535e
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index 55fb5f40fa9..4fa62a513da 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -323,7 +323,7 @@ impl ProjectDiff {
let editor = diff.editor().read(cx).rhs_editor().clone();
let editor = editor.read(cx);
let snapshot = diff.multibuffer().read(cx).snapshot(cx);
- let prev_next = snapshot.diff_hunks().nth(1).is_some();
+ let prev_next = snapshot.diff_hunks().next().is_some();
let (selection, ranges) = diff.selected_ranges(cx);
let mut has_staged_hunks = false;
let mut has_unstaged_hunks = false;
diff --git a/crates/git_ui/src/solo_diff_view.rs b/crates/git_ui/src/solo_diff_view.rs
index 0ccb2183ba2..904ef069369 100644
--- a/crates/git_ui/src/solo_diff_view.rs
+++ b/crates/git_ui/src/solo_diff_view.rs
@@ -269,7 +269,7 @@ impl SoloDiffView {
let editor = self.editor.read(cx).rhs_editor().read(cx);
let multibuffer = editor.buffer().read(cx);
let snapshot = multibuffer.snapshot(cx);
- let prev_next = snapshot.diff_hunks().nth(1).is_some();
+ let prev_next = snapshot.diff_hunks().next().is_some();
let mut selection = true;
let mut ranges = editor
diff --git a/crates/git_ui/src/staged_diff.rs b/crates/git_ui/src/staged_diff.rs
index 648b1980eb5..60cd0942a6c 100644
--- a/crates/git_ui/src/staged_diff.rs
+++ b/crates/git_ui/src/staged_diff.rs
@@ -268,7 +268,7 @@ impl StagedDiff {
let editor = diff.editor().read(cx).rhs_editor().clone();
let editor = editor.read(cx);
let snapshot = diff.multibuffer().read(cx).snapshot(cx);
- let prev_next = snapshot.diff_hunks().nth(1).is_some();
+ let prev_next = snapshot.diff_hunks().next().is_some();
let (selection, ranges) = diff.selected_ranges(cx);
let unstage = editor
.diff_hunks_in_ranges(&ranges, &snapshot)
diff --git a/crates/git_ui/src/unstaged_diff.rs b/crates/git_ui/src/unstaged_diff.rs
index e4a5165bb87..3e677353cf2 100644
--- a/crates/git_ui/src/unstaged_diff.rs
+++ b/crates/git_ui/src/unstaged_diff.rs
@@ -322,7 +322,7 @@ impl UnstagedDiff {
let editor = diff.editor().read(cx).rhs_editor().clone();
let editor = editor.read(cx);
let snapshot = diff.multibuffer().read(cx).snapshot(cx);
- let prev_next = snapshot.diff_hunks().nth(1).is_some();
+ let prev_next = snapshot.diff_hunks().next().is_some();
let (selection, ranges) = diff.selected_ranges(cx);
let stage = editor
.diff_hunks_in_ranges(&ranges, &snapshot)