suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle formatter errors, and save anyway (#3684) 

If formatting fails, report error to log and save without formatting.
pull/3015/head
A-Walrus 2022-09-07 10:22:48 +03:00 committed by GitHub
parent 301f5d7cf7
commit fe37a66046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
helix-view/src/document.rs
View File

@ -543,12 +543,19 @@ impl Document {
} }
if let Some(fmt) = formatting { if let Some(fmt) = formatting {
let transaction = fmt.await?; match fmt.await {
let success = transaction.changes().apply(&mut text); Ok(transaction) => {
if !success { let success = transaction.changes().apply(&mut text);
// This shouldn't happen, because the transaction changes were generated if !success {
// from the same text we're saving. // This shouldn't happen, because the transaction changes were generated
log::error!("failed to apply format changes before saving"); // from the same text we're saving.
log::error!("failed to apply format changes before saving");
}
}
Err(err) => {
// formatting failed: report error, and save file without modifications
log::error!("{}", err);
}
} }
} }