63e54e3 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Implement in-memory prompt history

63e54e3Blaž Hrastnik5 years ago

helix-core/src/register.rs+7−7

compare with master

unifiedsplit

@@ -22,13 +22,17 @@ impl Register {

22 self.name

23 }

25− pub fn read(&self) -> &Vec<String> {

25+ pub fn read(&self) -> &[String] {

26 &self.values

27 }

29 pub fn write(&mut self, values: Vec<String>) {

30 self.values = values;

31 }

32+

33+ pub fn push(&mut self, value: String) {

34+ self.values.push(value);

35+ }

32}

36}

34/// Currently just wraps a `HashMap` of `Register`s

38/// Currently just wraps a `HashMap` of `Register`s

@@ -42,11 +46,7 @@ impl Registers {

42 self.inner.get(&name)

46 self.inner.get(&name)

43 }

47 }

45− pub fn get_mut(&mut self, name: char) -> Option<&mut Register> {

49+ pub fn get_mut(&mut self, name: char) -> &mut Register {

46− self.inner.get_mut(&name)

47− }

48−

49− pub fn get_or_insert(&mut self, name: char) -> &mut Register {

50 self.inner

51 .entry(name)

52 .or_insert_with(|| Register::new(name))

@@ -57,7 +57,7 @@ impl Registers {

57 .insert(name, Register::new_with_values(name, values));

58 }

60− pub fn read(&self, name: char) -> Option<&Vec<String>> {

60+ pub fn read(&self, name: char) -> Option<&[String]> {

61 self.get(name).map(|reg| reg.read())

62 }

63}

helix-term/src/commands.rs+3−2

@@ -1126,7 +1126,7 @@ fn delete_selection(cx: &mut Context) {

1126 let reg_name = cx.selected_register.name();

1127 let (view, doc) = current!(cx.editor);

1128 let registers = &mut cx.editor.registers;

1129− let reg = registers.get_or_insert(reg_name);

1129+ let reg = registers.get_mut(reg_name);

1130 delete_selection_impl(reg, doc, view.id);

1131

1132 doc.append_changes_to_history(view.id);

@@ -1139,7 +1139,7 @@ fn change_selection(cx: &mut Context) {

1139 let reg_name = cx.selected_register.name();

1140 let (view, doc) = current!(cx.editor);

1141 let registers = &mut cx.editor.registers;

1142− let reg = registers.get_or_insert(reg_name);

1142+ let reg = registers.get_mut(reg_name);

1143 delete_selection_impl(reg, doc, view.id);

1144 enter_insert_mode(doc);

1145}

@@ -1920,6 +1920,7 @@ mod cmd {

1920fn command_mode(cx: &mut Context) {

1921 let mut prompt = Prompt::new(

1922 ":".to_owned(),

1923+ Some(':'),

1923 |input: &str| {

1924 |input: &str| {

1924 // we use .this over split_whitespace() because we care about empty segments

1925 // we use .this over split_whitespace() because we care about empty segments

1925 let parts = input.split(' ').collect::<Vec<&str>>();

1926 let parts = input.split(' ').collect::<Vec<&str>>();

helix-term/src/ui/mod.rs+1

@@ -36,6 +36,7 @@ pub fn regex_prompt(

37 Prompt::new(

38 prompt,

39+ None,

39 |_input: &str| Vec::new(), // this is fine because Vec::new() doesn't allocate

40 |_input: &str| Vec::new(), // this is fine because Vec::new() doesn't allocate

40 move |cx: &mut crate::compositor::Context, input: &str, event: PromptEvent| {

41 move |cx: &mut crate::compositor::Context, input: &str, event: PromptEvent| {

41 match event {

42 match event {

helix-term/src/ui/picker.rs+1

@@ -43,6 +43,7 @@ impl<T> Picker<T> {

43 ) -> Self {

44 let prompt = Prompt::new(

45 "".to_string(),

46+ None,

46 |_pattern: &str| Vec::new(),

47 |_pattern: &str| Vec::new(),

47 |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {

48 |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {

48 //

49 //

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

@@ -20,6 +20,8 @@ pub struct Prompt {

20 cursor: usize,

21 completion: Vec<Completion>,

22 selection: Option<usize>,

23+ history_register: Option<char>,

24+ history_pos: Option<usize>,

23 completion_fn: Box<dyn FnMut(&str) -> Vec<Completion>>,

25 completion_fn: Box<dyn FnMut(&str) -> Vec<Completion>>,

24 callback_fn: Box<dyn FnMut(&mut Context, &str, PromptEvent)>,

26 callback_fn: Box<dyn FnMut(&mut Context, &str, PromptEvent)>,

25 pub doc_fn: Box<dyn Fn(&str) -> Option<&'static str>>,

27 pub doc_fn: Box<dyn Fn(&str) -> Option<&'static str>>,

@@ -54,6 +56,7 @@ pub enum Movement {

54impl Prompt {

56impl Prompt {

55 pub fn new(

57 pub fn new(

56 prompt: String,

58 prompt: String,

59+ history_register: Option<char>,

57 mut completion_fn: impl FnMut(&str) -> Vec<Completion> + 'static,

60 mut completion_fn: impl FnMut(&str) -> Vec<Completion> + 'static,

58 callback_fn: impl FnMut(&mut Context, &str, PromptEvent) + 'static,

61 callback_fn: impl FnMut(&mut Context, &str, PromptEvent) + 'static,

59 ) -> Self {

62 ) -> Self {

@@ -63,6 +66,8 @@ impl Prompt {

63 cursor: 0,

66 cursor: 0,

64 completion: completion_fn(""),

67 completion: completion_fn(""),

65 selection: None,

68 selection: None,

69+ history_register,

70+ history_pos: None,

66 completion_fn: Box::new(completion_fn),

71 completion_fn: Box::new(completion_fn),

67 callback_fn: Box::new(callback_fn),

72 callback_fn: Box::new(callback_fn),

68 doc_fn: Box::new(|_| None),

73 doc_fn: Box::new(|_| None),

@@ -226,6 +231,28 @@ impl Prompt {

226 self.exit_selection();

231 self.exit_selection();

227 }

232 }

228

233

234+ pub fn change_history(&mut self, register: &[String], direction: CompletionDirection) {

235+ if register.is_empty() {

236+ return;

237+ }

238+

239+ let end = register.len().saturating_sub(1);

240+

241+ let index = match direction {

242+ CompletionDirection::Forward => self.history_pos.map_or(0, |i| i + 1),

243+ CompletionDirection::Backward => {

244+ self.history_pos.unwrap_or(register.len()).saturating_sub(1)

245+ }

246+ }

247+ .min(end);

248+

249+ self.line = register[index].clone();

250+

251+ self.history_pos = Some(index);

252+

253+ self.move_end();

254+ }

255+

229 pub fn change_completion_selection(&mut self, direction: CompletionDirection) {

256 pub fn change_completion_selection(&mut self, direction: CompletionDirection) {

230 if self.completion.is_empty() {

257 if self.completion.is_empty() {

231 return;

258 return;

@@ -468,9 +495,40 @@ impl Component for Prompt {

468 self.exit_selection();

495 self.exit_selection();

469 } else {

496 } else {

470 (self.callback_fn)(cx, &self.line, PromptEvent::Validate);

497 (self.callback_fn)(cx, &self.line, PromptEvent::Validate);

498+

499+ if let Some(register) = self.history_register {

500+ // store in history

501+ let register = cx.editor.registers.get_mut(register);

502+ register.push(self.line.clone());

503+ }

471 return close_fn;

504 return close_fn;

472 }

505 }

473 }

506 }

507+ KeyEvent {

508+ code: KeyCode::Char('p'),

509+ modifiers: KeyModifiers::CONTROL,

510+ }

511+ | KeyEvent {

512+ code: KeyCode::Up, ..

513+ } => {

514+ if let Some(register) = self.history_register {

515+ let register = cx.editor.registers.get_mut(register);

516+ self.change_history(register.read(), CompletionDirection::Backward);

517+ }

518+ }

519+ KeyEvent {

520+ code: KeyCode::Char('n'),

521+ modifiers: KeyModifiers::CONTROL,

522+ }

523+ | KeyEvent {

524+ code: KeyCode::Down,

525+ ..

526+ } => {

527+ if let Some(register) = self.history_register {

528+ let register = cx.editor.registers.get_mut(register);

529+ self.change_history(register.read(), CompletionDirection::Forward);

530+ }

531+ }

474 KeyEvent {

532 KeyEvent {

475 code: KeyCode::Tab, ..

533 code: KeyCode::Tab, ..

476 } => self.change_completion_selection(CompletionDirection::Forward),

534 } => self.change_completion_selection(CompletionDirection::Forward),