diff options
author | Luis Useche | 2024-03-19 11:16:30 +0000 |
---|---|---|
committer | GitHub | 2024-03-19 11:16:30 +0000 |
commit | 6a22d7d1cad8fde27d8ba02629c3d33ab535f7b5 (patch) | |
tree | fa1748be525a0851eadef48dca8a04333a250d85 | |
parent | 4d2282cbccff4dd0aaa901a3ea4fb28a2b8120aa (diff) |
Do not stop reloading docs on error (#9870)
In the `reload-all` command, we should not stop reloading the documents
if one error is found. Instead, we should report the error and continue
trying to reload the current open documents. This is useful in cases
where a backing file does not exist temporarily (e.g. when editing a git
patch in the outstanding chain that doesn't have a file just yet).
This change also remove the error messages in the cases where the
backing is `None`, like in new docs or `tutor`.
-rw-r--r-- | helix-term/src/commands/typed.rs | 6 | ||||
-rw-r--r-- | helix-view/src/document.rs | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs index 384db4ac..2ca3a561 100644 --- a/helix-term/src/commands/typed.rs +++ b/helix-term/src/commands/typed.rs @@ -1318,7 +1318,11 @@ fn reload_all( // Ensure that the view is synced with the document's history. view.sync_changes(doc); - doc.reload(view, &cx.editor.diff_providers)?; + if let Err(error) = doc.reload(view, &cx.editor.diff_providers) { + cx.editor.set_error(format!("{}", error)); + continue; + } + if let Some(path) = doc.path() { cx.editor .language_servers diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs index 5f3595ee..f813c742 100644 --- a/helix-view/src/document.rs +++ b/helix-view/src/document.rs @@ -993,11 +993,13 @@ impl Document { provider_registry: &DiffProviderRegistry, ) -> Result<(), Error> { let encoding = self.encoding; - let path = self - .path() - .filter(|path| path.exists()) - .ok_or_else(|| anyhow!("can't find file to reload from {:?}", self.display_name()))? - .to_owned(); + let path = match self.path() { + None => return Ok(()), + Some(path) => match path.exists() { + true => path.to_owned(), + false => bail!("can't find file to reload from {:?}", self.display_name()), + }, + }; // Once we have a valid path we check if its readonly status has changed self.detect_readonly(); |