mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-25 16:09:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Be clearer about using GitFilesIncluded setting

Browse source
This commit is contained in:
Julia 2022-10-03 11:58:48 -04:00
parent 01176e04b7
commit 9427bb7553
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
crates/project/src/worktree.rs
View file

@ -673,28 +673,27 @@ impl LocalWorktree {
cx.spawn(|this, mut cx| async move {
let text = fs.load(&abs_path).await?;
let head_text = if matches!(
files_included,
settings::GitFilesIncluded::All | settings::GitFilesIncluded::OnlyTracked
) {
let results = if let Some(repo) = snapshot.repo_for(&abs_path) {
cx.background()
.spawn({
let path = path.clone();
async move { repo.repo.lock().load_head_text(&path) }
})
.await
} else {
None
};
let head_text = match files_included {
settings::GitFilesIncluded::All | settings::GitFilesIncluded::OnlyTracked => {
let results = if let Some(repo) = snapshot.repo_for(&abs_path) {
cx.background()
.spawn({
let path = path.clone();
async move { repo.repo.lock().load_head_text(&path) }
})
.await
} else {
None
};
if files_included == settings::GitFilesIncluded::All {
results.or_else(|| Some(text.clone()))
} else {
results
if files_included == settings::GitFilesIncluded::All {
results.or_else(|| Some(text.clone()))
} else {
results
}
}
} else {
None
settings::GitFilesIncluded::None => None,
};
// Eagerly populate the snapshot with an updated entry for the loaded file