holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when attempting to enter help shell (#1201)

Browse Source 
`enter help` would result in a crash
This commit is contained in:
Corvus Corax 2020-01-12 22:27:00 -06:00 committed by Jonathan Turner
parent d3dae05714
commit 2f039b3abc
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/commands/enter.rs
View File

@ -6,7 +6,6 @@ use nu_errors::ShellError;
use nu_protocol::{ use nu_protocol::{
CallInfo, CommandAction, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value, CallInfo, CommandAction, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
}; };
use std::path::PathBuf;
pub struct Enter; pub struct Enter;
@ -46,23 +45,26 @@ impl PerItemCommand for Enter {
let location_clone = location_string.clone(); let location_clone = location_string.clone();
let tag_clone = tag.clone(); let tag_clone = tag.clone();
if location.starts_with("help") { if location_string.starts_with("help") {
let spec = location_string.split(':').collect::<Vec<&str>>(); let spec = location_string.split(':').collect::<Vec<&str>>();
let (_, command) = (spec[0], spec[1]); if spec.len() == 2 {
let (_, command) = (spec[0], spec[1]);
if registry.has(command)? { if registry.has(command)? {
Ok(vec![Ok(ReturnSuccess::Action(CommandAction::EnterHelpShell( return Ok(vec![Ok(ReturnSuccess::Action(
UntaggedValue::string(command).into_value(Tag::unknown()), CommandAction::EnterHelpShell(
)))] UntaggedValue::string(command).into_value(Tag::unknown()),
.into()) ),
} else { ))]
Ok(vec![Ok(ReturnSuccess::Action(CommandAction::EnterHelpShell( .into());
UntaggedValue::nothing().into_value(Tag::unknown()), }
)))]
.into())
} }
} else if PathBuf::from(location).is_dir() { Ok(vec![Ok(ReturnSuccess::Action(CommandAction::EnterHelpShell(
UntaggedValue::nothing().into_value(Tag::unknown()),
)))]
.into())
} else if location.is_dir() {
Ok(vec![Ok(ReturnSuccess::Action(CommandAction::EnterShell( Ok(vec![Ok(ReturnSuccess::Action(CommandAction::EnterShell(
location_clone, location_clone,
)))] )))]