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.

project: Load git diff bases concurrently (#55480)

Xiaobo Liu8d153d7feb6d
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index f5dd3bef95c..1e347b6af48 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -4565,15 +4565,16 @@ impl Repository {
&repo_diff_state_updates
{
let index_text = if current_index_text.is_some() {
- backend.load_index_text(repo_path.clone()).await
+ backend.load_index_text(repo_path.clone())
} else {
- None
+ future::ready(None).boxed()
};
let head_text = if current_head_text.is_some() {
- backend.load_committed_text(repo_path.clone()).await
+ backend.load_committed_text(repo_path.clone())
} else {
- None
+ future::ready(None).boxed()
};
+ let (index_text, head_text) = future::join(index_text, head_text).await;
let change =
match (current_index_text.as_ref(), current_head_text.as_ref()) {