adjust vim emulation

Author: achristmascarl

src/components/editor.rs

@@ -108,8 +108,11 @@ impl<'a> Component for Editor<'a> {
 
   fn draw(&mut self, f: &mut Frame<'_>, area: Rect, app_state: &AppState) -> Result<()> {
     let focused = app_state.focus == Focus::Editor;
-    let block =
-      self.vim_state.mode.block().border_style(if focused { Style::new().green() } else { Style::new().dim() });
+    let block = self.vim_state.mode.block().title("query").border_style(if focused {
+      Style::new().green()
+    } else {
+      Style::new().dim()
+    });
 
     self.textarea.set_block(block);
     self.textarea.set_line_number_style(if focused { Style::default().fg(Color::Yellow) } else { Style::new().dim() });

src/components/menu.rs

@@ -359,11 +359,11 @@ impl Component for Menu {
           f.render_stateful_widget(list, layout[layout_index], &mut self.list_state);
           let vertical_scrollbar = Scrollbar::new(ScrollbarOrientation::VerticalRight)
             .symbols(scrollbar::VERTICAL)
-            .style(Style::default().fg(if focused && !self.search_focused && self.menu_focus == MenuFocus::Tables {
-              Color::Green
+            .style(if focused && !self.search_focused && self.menu_focus == MenuFocus::Tables {
+              Style::default().fg(Color::Green)
             } else {
-              Color::DarkGray
-            }));
+              Style::default()
+            });
           let mut vertical_scrollbar_state =
             ScrollbarState::new(table_length.saturating_sub(available_height)).position(self.list_state.offset());
           f.render_stateful_widget(vertical_scrollbar, block_margin, &mut vertical_scrollbar_state);

src/vim.rs

@@ -1,4 +1,4 @@
-// vim emulation for tui_textarea. from:
+// vim emulation for tui_textarea. based on:
 // https://github.com/rhysd/tui-textarea/blob/main/examples/vim.rs
 use std::{env, fmt, fs, io, io::BufRead};
 
@@ -9,6 +9,7 @@ use crossterm::{
 use ratatui::{
   backend::CrosstermBackend,
   style::{Color, Modifier, Style},
+  text::Line,
   widgets::{Block, Borders},
   Terminal,
 };
@@ -26,13 +27,13 @@ pub enum Mode {
 impl Mode {
   pub fn block<'a>(&self) -> Block<'a> {
     let help = match self {
-      Self::Normal => "type q to quit, type i to enter insert mode",
+      Self::Normal => "type i to enter insert mode",
       Self::Insert => "type Esc to back to normal mode",
       Self::Visual => "type y to yank, type d to delete, type Esc to back to normal mode",
       Self::Operator(_) => "move cursor to apply operator",
     };
     let title = format!("{} MODE ({})", self, help);
-    Block::default().borders(Borders::ALL).title(title)
+    Block::default().borders(Borders::ALL).title_bottom(Line::from(title).right_aligned())
   }
 
   pub fn cursor_style(&self) -> Style {
@@ -42,7 +43,7 @@ impl Mode {
       Self::Visual => Color::LightYellow,
       Self::Operator(_) => Color::LightGreen,
     };
-    Style::default().fg(color).add_modifier(Modifier::REVERSED)
+    Style::default().add_modifier(Modifier::SLOW_BLINK)
   }
 }
 
@@ -93,6 +94,7 @@ impl Vim {
           Input { key: Key::Char('k'), .. } => textarea.move_cursor(CursorMove::Up),
           Input { key: Key::Char('l'), .. } => textarea.move_cursor(CursorMove::Forward),
           Input { key: Key::Char('w'), .. } => textarea.move_cursor(CursorMove::WordForward),
+          Input { key: Key::Char('e'), ctrl: false, .. } => textarea.move_cursor(CursorMove::WordForward),
           Input { key: Key::Char('b'), ctrl: false, .. } => textarea.move_cursor(CursorMove::WordBack),
           Input { key: Key::Char('^'), .. } => textarea.move_cursor(CursorMove::Head),
           Input { key: Key::Char('$'), .. } => textarea.move_cursor(CursorMove::End),
@@ -203,6 +205,10 @@ impl Vim {
             textarea.cut();
             return Transition::Mode(Mode::Insert);
           },
+          Input { key: Key::Esc, .. } => {
+            textarea.cancel_selection();
+            return Transition::Mode(Mode::Normal);
+          },
           input => return Transition::Pending(input),
         }