Minor fixes

gchp · Jul 27, 2016 · 95f6f4e · 95f6f4e
1 parent f4eecc7
commit 95f6f4e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 31 deletions.
diff --git a/src/iota/chained_command.rs b/src/iota/chained_command.rs
@@ -100,6 +100,9 @@ impl ChainedCmdBuilder {
         if self.quit {
             res.push(Command::exit_editor());
         }
+        if res.is_empty() {
+            res.push(Command::noop());
+        }
 
         return res;
     }
@@ -155,6 +158,6 @@ impl<'a> ChainedCmdParser<'a> {
             }
             self.pos += 1;
         }
-        str::from_utf8(&self.buffer[start..self.pos]).unwrap_or("")
+        str::from_utf8(&self.buffer[start..self.pos + 1]).unwrap_or("")
     }
 }
diff --git a/src/iota/editor.rs b/src/iota/editor.rs
@@ -61,37 +61,33 @@ impl<'e, T: Frontend> Editor<'e, T> {
             None => return
         };
 
-        let mut remove_overlay = false;
-        let mut command = BuilderEvent::Incomplete;
-
         match self.view.overlay {
-            Overlay::None => { command = self.mode.handle_key_event(key) },
+            Overlay::None => { 
+                let command = self.mode.handle_key_event(key);
+                if let BuilderEvent::Complete(c) = command {
+                    self.handle_command(c);
+                }
+            },
             _             => {
                 let event = self.view.overlay.handle_key_event(key);
                 match event {
-                    OverlayEvent::Finished(response) => {
-                        remove_overlay = true;
-                        let commands = self.handle_overlay_response(response);
-                        for cmd in commands {
-                            if let BuilderEvent::Complete(c) = cmd {
-                                self.handle_command(c);
-                            }
-                        }
-                    }
-
-                    _ => { command = BuilderEvent::Incomplete }
+                    OverlayEvent::Finished(response) => { self.handle_overlay_cmd(response) },
+                    _ => { return }
                 }
             }
         }
-
-        if remove_overlay {
-            self.view.overlay = Overlay::None;
-            self.view.clear(&mut self.frontend);
-        }
-
-        if let BuilderEvent::Complete(c) = command {
-            self.handle_command(c);
+    }
+
+    // Handles commands issued via overlay
+    fn handle_overlay_cmd(&mut self, event: Option<String>) {
+        let commands = self.handle_overlay_response(event);
+        for cmd in commands {
+            if let BuilderEvent::Complete(c) = cmd {
+                self.handle_command(c);
+            }
         }
+        self.view.overlay = Overlay::None;
+        self.view.clear(&mut self.frontend);
     }
 
     /// Translate the response from an Overlay to a Command wrapped in a BuilderEvent
@@ -109,13 +105,8 @@ impl<'e, T: Frontend> Editor<'e, T> {
                     Overlay::Prompt { ref data, .. } => {
                         let mut builder = ChainedCmdBuilder::new();
                         let cmds: Vec<Command> = builder.parse(&**data);
-
-                        if cmds.len() < 1 {
-                            commands.push(BuilderEvent::Incomplete);
-                        } else {
-                            for cmd in cmds {
-                                commands.push(BuilderEvent::Complete(cmd));
-                            }
+                        for cmd in cmds {
+                            commands.push(BuilderEvent::Complete(cmd));
                         }
                     }