7c9f620 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

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

7c9f620Bob5 years ago

book/src/keymap.md+3−1

compare with master

unifiedsplit

@@ -274,8 +274,10 @@ Keys to use within prompt, Remapping currently not supported.

274| `Ctrl-e`, `End` | move prompt end |

275| `Ctrl-a`, `Home` | move prompt start |

276| `Ctrl-w` | delete previous word |

277+| `Ctrl-u` | delete to start of line |

277| `Ctrl-k` | delete to end of line |

278| `Ctrl-k` | delete to end of line |

279+| `backspace`, `Ctrl-h` | delete previous char |

278−| `backspace` | delete previous char |

280+| `delete`, `Ctrl-d` | delete previous char |

279| `Ctrl-s` | insert a word under doc cursor, may be changed to Ctrl-r Ctrl-w later |

281| `Ctrl-s` | insert a word under doc cursor, may be changed to Ctrl-r Ctrl-w later |

280| `Ctrl-p`, `Up` | select previous history |

282| `Ctrl-p`, `Up` | select previous history |

281| `Ctrl-n`, `Down` | select next history |

283| `Ctrl-n`, `Down` | select next history |

helix-term/src/ui/prompt.rs+36

@@ -212,6 +212,14 @@ impl Prompt {

212 self.completion = (self.completion_fn)(&self.line);

213 }

214

215+ pub fn delete_char_forwards(&mut self) {

216+ let pos = self.eval_movement(Movement::ForwardChar(1));

217+ self.line.replace_range(self.cursor..pos, "");

218+

219+ self.exit_selection();

220+ self.completion = (self.completion_fn)(&self.line);

221+ }

222+

215 pub fn delete_word_backwards(&mut self) {

223 pub fn delete_word_backwards(&mut self) {

216 let pos = self.eval_movement(Movement::BackwardWord(1));

224 let pos = self.eval_movement(Movement::BackwardWord(1));

217 self.line.replace_range(pos..self.cursor, "");

225 self.line.replace_range(pos..self.cursor, "");

@@ -221,6 +229,15 @@ impl Prompt {

221 self.completion = (self.completion_fn)(&self.line);

229 self.completion = (self.completion_fn)(&self.line);

222 }

230 }

223

231

232+ pub fn kill_to_start_of_line(&mut self) {

233+ let pos = self.eval_movement(Movement::StartOfLine);

234+ self.line.replace_range(pos..self.cursor, "");

235+ self.cursor = pos;

236+

237+ self.exit_selection();

238+ self.completion = (self.completion_fn)(&self.line);

239+ }

240+

224 pub fn kill_to_end_of_line(&mut self) {

241 pub fn kill_to_end_of_line(&mut self) {

225 let pos = self.eval_movement(Movement::EndOfLine);

242 let pos = self.eval_movement(Movement::EndOfLine);

226 self.line.replace_range(self.cursor..pos, "");

243 self.line.replace_range(self.cursor..pos, "");

@@ -472,12 +489,31 @@ impl Component for Prompt {

472 modifiers: KeyModifiers::CONTROL,

489 modifiers: KeyModifiers::CONTROL,

473 } => self.kill_to_end_of_line(),

490 } => self.kill_to_end_of_line(),

474 KeyEvent {

491 KeyEvent {

492+ code: KeyCode::Char('u'),

493+ modifiers: KeyModifiers::CONTROL,

494+ } => self.kill_to_start_of_line(),

495+ KeyEvent {

496+ code: KeyCode::Char('h'),

497+ modifiers: KeyModifiers::CONTROL,

498+ }

499+ | KeyEvent {

475 code: KeyCode::Backspace,

500 code: KeyCode::Backspace,

476 modifiers: KeyModifiers::NONE,

501 modifiers: KeyModifiers::NONE,

477 } => {

502 } => {

478 self.delete_char_backwards();

503 self.delete_char_backwards();

479 (self.callback_fn)(cx, &self.line, PromptEvent::Update);

504 (self.callback_fn)(cx, &self.line, PromptEvent::Update);

480 }

505 }

506+ KeyEvent {

507+ code: KeyCode::Char('d'),

508+ modifiers: KeyModifiers::CONTROL,

509+ }

510+ | KeyEvent {

511+ code: KeyCode::Delete,

512+ modifiers: KeyModifiers::NONE,

513+ } => {

514+ self.delete_char_forwards();

515+ (self.callback_fn)(cx, &self.line, PromptEvent::Update);

516+ }

481 KeyEvent {

517 KeyEvent {

482 code: KeyCode::Char('s'),

518 code: KeyCode::Char('s'),

483 modifiers: KeyModifiers::CONTROL,

519 modifiers: KeyModifiers::CONTROL,