Fix process spawning error handling (#3349)

* Fix process spawning error handling

* Log stderr in any case
pull/3609/head
PiergiorgioZagaria 2 years ago committed by GitHub
parent 5f043dde56
commit d2cec25395
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -4596,8 +4596,18 @@ fn shell_impl(
} }
let output = process.wait_with_output()?; let output = process.wait_with_output()?;
if !output.stderr.is_empty() { if !output.status.success() {
log::error!("Shell error: {}", String::from_utf8_lossy(&output.stderr)); if !output.stderr.is_empty() {
let err = String::from_utf8_lossy(&output.stderr).to_string();
log::error!("Shell error: {}", err);
bail!("Shell error: {}", err);
}
bail!("Shell command failed");
} else if !output.stderr.is_empty() {
log::debug!(
"Command printed to stderr: {}",
String::from_utf8_lossy(&output.stderr).to_string()
);
} }
let str = std::str::from_utf8(&output.stdout) let str = std::str::from_utf8(&output.stdout)

@ -440,17 +440,22 @@ impl Document {
.await .await
.map_err(|_| FormatterError::WaitForOutputFailed)?; .map_err(|_| FormatterError::WaitForOutputFailed)?;
if !output.stderr.is_empty() {
return Err(FormatterError::Stderr(
String::from_utf8_lossy(&output.stderr).to_string(),
));
}
if !output.status.success() { if !output.status.success() {
return Err(FormatterError::NonZeroExitStatus); if !output.stderr.is_empty() {
let err = String::from_utf8_lossy(&output.stderr).to_string();
log::error!("Formatter error: {}", err);
return Err(FormatterError::NonZeroExitStatus(Some(err)));
}
return Err(FormatterError::NonZeroExitStatus(None));
} else if !output.stderr.is_empty() {
log::debug!(
"Formatter printed to stderr: {}",
String::from_utf8_lossy(&output.stderr).to_string()
);
} }
let str = String::from_utf8(output.stdout) let str = std::str::from_utf8(&output.stdout)
.map_err(|_| FormatterError::InvalidUtf8Output)?; .map_err(|_| FormatterError::InvalidUtf8Output)?;
Ok(helix_core::diff::compare_ropes(&text, &Rope::from(str))) Ok(helix_core::diff::compare_ropes(&text, &Rope::from(str)))
@ -1102,10 +1107,9 @@ pub enum FormatterError {
}, },
BrokenStdin, BrokenStdin,
WaitForOutputFailed, WaitForOutputFailed,
Stderr(String),
InvalidUtf8Output, InvalidUtf8Output,
DiskReloadError(String), DiskReloadError(String),
NonZeroExitStatus, NonZeroExitStatus(Option<String>),
} }
impl std::error::Error for FormatterError {} impl std::error::Error for FormatterError {}
@ -1118,10 +1122,12 @@ impl Display for FormatterError {
} }
Self::BrokenStdin => write!(f, "Could not write to formatter stdin"), Self::BrokenStdin => write!(f, "Could not write to formatter stdin"),
Self::WaitForOutputFailed => write!(f, "Waiting for formatter output failed"), Self::WaitForOutputFailed => write!(f, "Waiting for formatter output failed"),
Self::Stderr(output) => write!(f, "Formatter error: {}", output),
Self::InvalidUtf8Output => write!(f, "Invalid UTF-8 formatter output"), Self::InvalidUtf8Output => write!(f, "Invalid UTF-8 formatter output"),
Self::DiskReloadError(error) => write!(f, "Error reloading file from disk: {}", error), Self::DiskReloadError(error) => write!(f, "Error reloading file from disk: {}", error),
Self::NonZeroExitStatus => write!(f, "Formatter exited with non zero exit status:"), Self::NonZeroExitStatus(Some(output)) => write!(f, "Formatter error: {}", output),
Self::NonZeroExitStatus(None) => {
write!(f, "Formatter exited with non zero exit status")
}
} }
} }
} }

Loading…
Cancel
Save