Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-11-10 23:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

run_external: only suggest alternative commands when file not found (#6311)

Browse source
This commit is contained in:
Reilly Wood 2022-08-12 21:27:50 -07:00 committed by GitHub
parent cb18dd5200
commit 3b6c4c1bb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
crates/nu-command/src/system/run_external.rs
View file

@ -205,34 +205,43 @@ impl ExternalCommand {
match child {
Err(err) => {
// recommend a replacement if the user tried a deprecated command
let command_name_lower = self.name.item.to_lowercase();
let deprecated = crate::deprecated_commands();
if deprecated.contains_key(&command_name_lower) {
let replacement = match deprecated.get(&command_name_lower) {
Some(s) => s.clone(),
None => "".to_string(),
};
return Err(ShellError::DeprecatedCommand(
command_name_lower,
replacement,
match err.kind() {
// If file not found, try suggesting alternative commands to the user
std::io::ErrorKind::NotFound => {
// recommend a replacement if the user tried a deprecated command
let command_name_lower = self.name.item.to_lowercase();
let deprecated = crate::deprecated_commands();
if deprecated.contains_key(&command_name_lower) {
let replacement = match deprecated.get(&command_name_lower) {
Some(s) => s.clone(),
None => "".to_string(),
};
return Err(ShellError::DeprecatedCommand(
command_name_lower,
replacement,
self.name.span,
));
}
let suggestion = suggest_command(&self.name.item, engine_state);
let label = match suggestion {
Some(s) => format!("did you mean '{s}'?"),
None => "can't run executable".into(),
};
Err(ShellError::ExternalCommand(
label,
err.to_string(),
self.name.span,
))
}
// otherwise, a default error message
_ => Err(ShellError::ExternalCommand(
"can't run executable".into(),
err.to_string(),
self.name.span,
));
)),
}
// If we try to run an external but can't, there's a good chance
// that the user entered the wrong command name
let suggestion = suggest_command(&self.name.item, engine_state);
let label = match suggestion {
Some(s) => format!("did you mean '{s}'?"),
None => "can't run executable".into(),
};
Err(ShellError::ExternalCommand(
label,
err.to_string(),
self.name.span,
))
}
Ok(mut child) => {
if !input.is_nothing() {