add <C-h>, <C-u>, <C-d>, Delete in prompt mode (#1034)

pull/1042/head
Bob 3 years ago committed by GitHub
parent 490919df4f
commit 7c9f620236
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -274,8 +274,10 @@ Keys to use within prompt, Remapping currently not supported.
| `Ctrl-e`, `End` | move prompt end | | `Ctrl-e`, `End` | move prompt end |
| `Ctrl-a`, `Home` | move prompt start | | `Ctrl-a`, `Home` | move prompt start |
| `Ctrl-w` | delete previous word | | `Ctrl-w` | delete previous word |
| `Ctrl-u` | delete to start of line |
| `Ctrl-k` | delete to end of line | | `Ctrl-k` | delete to end of line |
| `backspace` | delete previous char | | `backspace`, `Ctrl-h` | delete previous char |
| `delete`, `Ctrl-d` | delete previous char |
| `Ctrl-s` | insert a word under doc cursor, may be changed to Ctrl-r Ctrl-w later | | `Ctrl-s` | insert a word under doc cursor, may be changed to Ctrl-r Ctrl-w later |
| `Ctrl-p`, `Up` | select previous history | | `Ctrl-p`, `Up` | select previous history |
| `Ctrl-n`, `Down` | select next history | | `Ctrl-n`, `Down` | select next history |

@ -212,6 +212,14 @@ impl Prompt {
self.completion = (self.completion_fn)(&self.line); self.completion = (self.completion_fn)(&self.line);
} }
pub fn delete_char_forwards(&mut self) {
let pos = self.eval_movement(Movement::ForwardChar(1));
self.line.replace_range(self.cursor..pos, "");
self.exit_selection();
self.completion = (self.completion_fn)(&self.line);
}
pub fn delete_word_backwards(&mut self) { pub fn delete_word_backwards(&mut self) {
let pos = self.eval_movement(Movement::BackwardWord(1)); let pos = self.eval_movement(Movement::BackwardWord(1));
self.line.replace_range(pos..self.cursor, ""); self.line.replace_range(pos..self.cursor, "");
@ -221,6 +229,15 @@ impl Prompt {
self.completion = (self.completion_fn)(&self.line); self.completion = (self.completion_fn)(&self.line);
} }
pub fn kill_to_start_of_line(&mut self) {
let pos = self.eval_movement(Movement::StartOfLine);
self.line.replace_range(pos..self.cursor, "");
self.cursor = pos;
self.exit_selection();
self.completion = (self.completion_fn)(&self.line);
}
pub fn kill_to_end_of_line(&mut self) { pub fn kill_to_end_of_line(&mut self) {
let pos = self.eval_movement(Movement::EndOfLine); let pos = self.eval_movement(Movement::EndOfLine);
self.line.replace_range(self.cursor..pos, ""); self.line.replace_range(self.cursor..pos, "");
@ -472,12 +489,31 @@ impl Component for Prompt {
modifiers: KeyModifiers::CONTROL, modifiers: KeyModifiers::CONTROL,
} => self.kill_to_end_of_line(), } => self.kill_to_end_of_line(),
KeyEvent { KeyEvent {
code: KeyCode::Char('u'),
modifiers: KeyModifiers::CONTROL,
} => self.kill_to_start_of_line(),
KeyEvent {
code: KeyCode::Char('h'),
modifiers: KeyModifiers::CONTROL,
}
| KeyEvent {
code: KeyCode::Backspace, code: KeyCode::Backspace,
modifiers: KeyModifiers::NONE, modifiers: KeyModifiers::NONE,
} => { } => {
self.delete_char_backwards(); self.delete_char_backwards();
(self.callback_fn)(cx, &self.line, PromptEvent::Update); (self.callback_fn)(cx, &self.line, PromptEvent::Update);
} }
KeyEvent {
code: KeyCode::Char('d'),
modifiers: KeyModifiers::CONTROL,
}
| KeyEvent {
code: KeyCode::Delete,
modifiers: KeyModifiers::NONE,
} => {
self.delete_char_forwards();
(self.callback_fn)(cx, &self.line, PromptEvent::Update);
}
KeyEvent { KeyEvent {
code: KeyCode::Char('s'), code: KeyCode::Char('s'),
modifiers: KeyModifiers::CONTROL, modifiers: KeyModifiers::CONTROL,

Loading…
Cancel
Save