d2cec25 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Fix process spawning error handling (#3349)

d2cec25PiergiorgioZagaria4 years ago

helix-term/src/commands.rs+12−2

compare with master

unifiedsplit

@@ -4596,8 +4596,18 @@ fn shell_impl(

4596 }

4597 let output = process.wait_with_output()?;

4598

4599+ if !output.status.success() {

4599− if !output.stderr.is_empty() {

4600+ if !output.stderr.is_empty() {

4601+ let err = String::from_utf8_lossy(&output.stderr).to_string();

4602+ log::error!("Shell error: {}", err);

4603+ bail!("Shell error: {}", err);

4604+ }

4605+ bail!("Shell command failed");

4606+ } else if !output.stderr.is_empty() {

4607+ log::debug!(

4608+ "Command printed to stderr: {}",

4600− log::error!("Shell error: {}", String::from_utf8_lossy(&output.stderr));

4609+ String::from_utf8_lossy(&output.stderr).to_string()

4610+ );

4601 }

4611 }

4602

4612

4603 let str = std::str::from_utf8(&output.stdout)

4613 let str = std::str::from_utf8(&output.stdout)

helix-view/src/document.rs+18−12

@@ -440,17 +440,22 @@ impl Document {

440 .await

441 .map_err(|_| FormatterError::WaitForOutputFailed)?;

442

443− if !output.stderr.is_empty() {

444− return Err(FormatterError::Stderr(

445− String::from_utf8_lossy(&output.stderr).to_string(),

446− ));

447− }

448−

449 if !output.status.success() {

443 if !output.status.success() {

444+ if !output.stderr.is_empty() {

445+ let err = String::from_utf8_lossy(&output.stderr).to_string();

446+ log::error!("Formatter error: {}", err);

450− return Err(FormatterError::NonZeroExitStatus);

447+ return Err(FormatterError::NonZeroExitStatus(Some(err)));

448+ }

449+

450+ return Err(FormatterError::NonZeroExitStatus(None));

451+ } else if !output.stderr.is_empty() {

452+ log::debug!(

453+ "Formatter printed to stderr: {}",

454+ String::from_utf8_lossy(&output.stderr).to_string()

455+ );

451 }

456 }

452

457

453− let str = String::from_utf8(output.stdout)

458+ let str = std::str::from_utf8(&output.stdout)

454 .map_err(|_| FormatterError::InvalidUtf8Output)?;

459 .map_err(|_| FormatterError::InvalidUtf8Output)?;

455

460

456 Ok(helix_core::diff::compare_ropes(&text, &Rope::from(str)))

461 Ok(helix_core::diff::compare_ropes(&text, &Rope::from(str)))

@@ -1102,10 +1107,9 @@ pub enum FormatterError {

1102 },

1107 },

1103 BrokenStdin,

1108 BrokenStdin,

1104 WaitForOutputFailed,

1109 WaitForOutputFailed,

1105− Stderr(String),

1106 InvalidUtf8Output,

1110 InvalidUtf8Output,

1107 DiskReloadError(String),

1111 DiskReloadError(String),

1108− NonZeroExitStatus,

1112+ NonZeroExitStatus(Option<String>),

1109}

1113}

1110

1114

1111impl std::error::Error for FormatterError {}

1115impl std::error::Error for FormatterError {}

@@ -1118,10 +1122,12 @@ impl Display for FormatterError {

1118 }

1122 }

1119 Self::BrokenStdin => write!(f, "Could not write to formatter stdin"),

1123 Self::BrokenStdin => write!(f, "Could not write to formatter stdin"),

1120 Self::WaitForOutputFailed => write!(f, "Waiting for formatter output failed"),

1124 Self::WaitForOutputFailed => write!(f, "Waiting for formatter output failed"),

1121− Self::Stderr(output) => write!(f, "Formatter error: {}", output),

1122 Self::InvalidUtf8Output => write!(f, "Invalid UTF-8 formatter output"),

1125 Self::InvalidUtf8Output => write!(f, "Invalid UTF-8 formatter output"),

1123 Self::DiskReloadError(error) => write!(f, "Error reloading file from disk: {}", error),

1126 Self::DiskReloadError(error) => write!(f, "Error reloading file from disk: {}", error),

1127+ Self::NonZeroExitStatus(Some(output)) => write!(f, "Formatter error: {}", output),

1128+ Self::NonZeroExitStatus(None) => {

1124− Self::NonZeroExitStatus => write!(f, "Formatter exited with non zero exit status:"),

1129+ write!(f, "Formatter exited with non zero exit status")

1130+ }

1125 }

1131 }

1126 }

1132 }

1127}

1133}