added move left&right, delete char

helix-core/src/state.rs

@@ -10,7 +10,7 @@ pub enum Mode {
     Normal,
     Insert,
     Goto,
-    Prompt,
+    Command,
 }
 
 /// A state represents the current editor state of a single buffer.

helix-term/src/editor.rs

@@ -237,7 +237,7 @@ pub fn render_statusline(&mut self, text_color: Style) {
             Mode::Insert => "INS",
             Mode::Normal => "NOR",
             Mode::Goto => "GOTO",
-            Mode::Prompt => "PRO", // prompt?
+            Mode::Command => "COM", // command?
         };
         // statusline
         self.surface.set_style(
@@ -249,14 +249,17 @@ pub fn render_statusline(&mut self, text_color: Style) {
     }
 
     pub fn render_prompt(&mut self, text_color: Style) {
+        // TODO: maybe name this render_commandline
         use tui::backend::Backend;
         let view = self.view.as_ref().unwrap();
         // render buffer text
         let buffer_string;
-        if view.state.mode == Mode::Prompt {
+        if view.state.mode == Mode::Command {
             buffer_string = &self.prompt.buffer;
             self.surface
-                .set_string(1, self.size.1 - 1, buffer_string, text_color);
+                .set_string(1, self.size.1 - 1, String::from(":"), text_color);
+            self.surface
+                .set_string(2, self.size.1 - 1, buffer_string, text_color);
         } else {
             buffer_string = &String::from("");
         }
@@ -277,8 +280,8 @@ pub fn render_cursor(&mut self, viewport: Rect, text_color: Style) {
             Mode::Insert => write!(stdout, "\x1B[6 q"),
             mode => write!(stdout, "\x1B[2 q"),
         };
-        if view.state.mode() == Mode::Prompt {
-            pos = Position::new(self.size.0 as usize, 1 + self.prompt.buffer.len());
+        if view.state.mode() == Mode::Command {
+            pos = Position::new(self.size.0 as usize, 2 + self.prompt.cursor_loc);
         } else {
             if let Some(path) = view.state.path() {
                 self.surface
@@ -346,8 +349,8 @@ pub async fn event_loop(&mut self) {
                                 }
                                 view.ensure_cursor_in_view();
                             }
-                            Mode::Prompt => {
-                                self.prompt.handle_keyevent(event, view);
+                            Mode::Command => {
+                                self.prompt.handle_input(event, view);
                             }
                             mode => {
                                 if let Some(command) = keymap[&mode].get(&keys) {

helix-view/src/commands.rs

@@ -307,20 +307,8 @@ pub fn append_mode(view: &mut View, _count: usize) {
     })
 }
 
-pub fn prompt_mode(view: &mut View, _count: usize) {
-    view.state.mode = Mode::Prompt;
-}
-
-pub fn move_char_left_prompt(prompt: &mut Prompt, _char: char) {
-    if prompt.cursor_loc > 1 {
-        prompt.cursor_loc -= 1;
-    }
-}
-
-pub fn move_char_right_prompt(prompt: &mut Prompt, _char: char) {
-    if prompt.cursor_loc < prompt.buffer.len() {
-        prompt.cursor_loc += 1;
-    }
+pub fn command_mode(view: &mut View, _count: usize) {
+    view.state.mode = Mode::Command;
 }
 
 // TODO: I, A, o and O can share a lot of the primitives.

helix-view/src/keymap.rs

@@ -163,7 +163,7 @@ pub fn default() -> Keymaps {
                 vec![key!('p')] => commands::paste,
                 vec![key!('>')] => commands::indent,
                 vec![key!('<')] => commands::unindent,
-                vec![key!(':')] => commands::prompt_mode,
+                vec![key!(':')] => commands::command_mode,
                 vec![Key {
                     code: KeyCode::Esc,
                     modifiers: Modifiers::NONE
@@ -209,11 +209,5 @@ pub fn default() -> Keymaps {
                 vec![key!('g')] => commands::move_file_start as Command,
                 vec![key!('e')] => commands::move_file_end as Command,
             ),
-            state::Mode::Prompt => hashmap!(
-                vec![Key {
-                    code: KeyCode::Esc,
-                    modifiers: Modifiers::NONE
-                }] => commands::normal_mode as Command,
-            )
     )
 }

helix-view/src/prompt.rs

@@ -11,17 +11,37 @@ pub struct Prompt {
 impl Prompt {
     pub fn new() -> Prompt {
         let prompt = Prompt {
-            buffer: String::from(":"), // starting prompt symbol
+            buffer: String::from(""),
             cursor_loc: 0,
         };
         prompt
     }
 
     pub fn insert_char(&mut self, c: char) {
-        self.buffer.push(c);
+        self.buffer.insert(self.cursor_loc, c);
+        self.cursor_loc += 1;
     }
 
-    pub fn handle_keyevent(&mut self, key_event: KeyEvent, view: &mut View) {
+    pub fn move_char_left_prompt(&mut self) {
+        if self.cursor_loc > 1 {
+            self.cursor_loc -= 1;
+        }
+    }
+
+    pub fn move_char_right_prompt(&mut self) {
+        if self.cursor_loc < self.buffer.len() {
+            self.cursor_loc += 1;
+        }
+    }
+
+    pub fn delete_char_backwards(&mut self) {
+        if self.cursor_loc > 0 {
+            self.buffer.remove(self.cursor_loc - 1);
+            self.cursor_loc -= 1;
+        }
+    }
+
+    pub fn handle_input(&mut self, key_event: KeyEvent, view: &mut View) {
         match key_event {
             KeyEvent {
                 code: KeyCode::Char(c),
@@ -30,6 +50,18 @@ pub fn handle_keyevent(&mut self, key_event: KeyEvent, view: &mut View) {
             KeyEvent {
                 code: KeyCode::Esc, ..
             } => commands::normal_mode(view, 1),
+            KeyEvent {
+                code: KeyCode::Right,
+                ..
+            } => self.move_char_right_prompt(),
+            KeyEvent {
+                code: KeyCode::Left,
+                ..
+            } => self.move_char_left_prompt(),
+            KeyEvent {
+                code: KeyCode::Backspace,
+                ..
+            } => self.delete_char_backwards(),
             _ => (),
         }
     }