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

project_diff: Keep going after failing to rescan a buffer (#21673)

Browse source 
I ran into a case locally where the project diff view was unexpectedly
empty because the first file to be scanned wasn't valid UTF-8, and the
inmost loop in `schedule_worktree_rescan` currently breaks when any
loading task fails. It seems like it might make more sense to continue
with the rest of the buffers in this case and also when
`Project::open_unstaged_changes` fails. I've left the error handling for
`update` as-is.

Release Notes:

- Fix project diff view missing files
This commit is contained in:
Cole Miller 2024-12-07 12:56:52 -05:00 • committed by GitHub
parent eb3d3eaebf
commit c5b6d78d5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/editor/src/git/project_diff.rs
View file

@ -6,7 +6,7 @@ use std::{
time::Duration,
};
use anyhow::Context as _;
use anyhow::{anyhow, Context as _};
use collections::{BTreeMap, HashMap};
use feature_flags::FeatureFlagAppExt;
use git::{
@ -235,22 +235,30 @@ impl ProjectDiffEditor {
>::default();
let mut change_sets = Vec::new();
for (status, entry_id, entry_path, open_task) in open_tasks {
let (_, opened_model) = open_task.await.with_context(|| {
format!("loading buffer {:?} for git diff", entry_path.path)
})?;
let buffer = match opened_model.downcast::<Buffer>() {
Ok(buffer) => buffer,
Err(_model) => anyhow::bail!(
"Could not load {:?} as a buffer for git diff",
entry_path.path
),
let Some(buffer) = open_task
.await
.and_then(|(_, opened_model)| {
opened_model
.downcast::<Buffer>()
.map_err(|_| anyhow!("Unexpected non-buffer"))
})
.with_context(|| {
format!("loading {} for git diff", entry_path.path.display())
})
.log_err()
else {
continue;
};
let change_set = project
let Some(change_set) = project
.update(&mut cx, |project, cx| {
project.open_unstaged_changes(buffer.clone(), cx)
})?
.await?;
.await
.log_err()
else {
continue;
};
cx.update(|cx| {
buffers.insert(
@ -267,7 +275,7 @@ impl ProjectDiffEditor {
new_entries.push((entry_path, entry_id));
}
Ok((buffers, new_entries, change_sets))
anyhow::Ok((buffers, new_entries, change_sets))
})
.await
.log_err()