diff options
author | Canop <cano.petrole@gmail.com> | 2019-01-15 15:11:14 +0100 |
---|---|---|
committer | Canop <cano.petrole@gmail.com> | 2019-01-15 15:11:14 +0100 |
commit | 45c3b9819b6d2e569042850b34e530cc306a91ed (patch) | |
tree | 92fdbdc0686f00ffeb77eb73d2609402cf0b3c34 /src/commands.rs | |
parent | 9cbcc3ae005a570ce0e67eba607456dbf9c01c5b (diff) |
completely deleting a pattern with the delete key now removes it
Diffstat (limited to 'src/commands.rs')
-rw-r--r-- | src/commands.rs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/commands.rs b/src/commands.rs index 0f8af76..d3af72d 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -67,19 +67,17 @@ impl CommandParts { impl Action { pub fn from(cp: &CommandParts, finished: bool) -> Action { if let Some(verb) = &cp.verb { - return match finished { + match finished { false => Action::VerbEdit(String::from(verb.as_str())), true => Action::Verb(String::from(verb.as_str())), - }; - } - if finished { - return Action::OpenSelection; - } - if let Some(pattern) = &cp.pattern { - let pattern = pattern.as_str(); - return Action::PatternEdit(String::from(pattern)); + } + } else if finished { + Action::OpenSelection + } else if let Some(pattern) = &cp.pattern { + Action::PatternEdit(String::from(pattern.as_str())) + } else { + Action::PatternEdit(String::from("")) } - Action::Unparsed } } |