Merge c485063e78 into 7ebf650029

book/src/keymap.md

@@ -287,6 +287,7 @@ This layer is a kludge of mappings, mostly pickers.
 | `F`     | Open file picker at current working directory                           | `file_picker_in_current_directory`         |
 | `b`     | Open buffer picker                                                      | `buffer_picker`                            |
 | `j`     | Open jumplist picker                                                    | `jumplist_picker`                          |
+| `:`     | Open command history picker                                             | `command_history_picker`                   |
 | `g`     | Open changed file picker                                                | `changed_file_picker`                      |
 | `G`     | Debug (experimental)                                                    | N/A                                        |
 | `k`     | Show documentation for item under cursor in a [popup](#popup) (**LSP**) | `hover`                                    |

helix-term/src/commands.rs

@@ -404,6 +404,7 @@ impl MappableCommand {
         code_action, "Perform code action",
         buffer_picker, "Open buffer picker",
         jumplist_picker, "Open jumplist picker",
+        command_history_picker, "Open command history picker",
         symbol_picker, "Open symbol picker",
         changed_file_picker, "Open changed file picker",
         select_references_to_symbol_under_cursor, "Select symbol references",
@@ -3180,6 +3181,42 @@ fn buffer_picker(cx: &mut Context) {
     cx.push_layer(Box::new(overlaid(picker)));
 }
 
+fn command_history_picker(cx: &mut Context) {
+    let command_history = cx.editor.registers.read(':', cx.editor);
+
+    let items: Vec<Command> = command_history
+        .into_iter()
+        .flatten()
+        .map(|entry| Command {
+            args: entry.to_string(),
+        })
+        .collect();
+
+    struct Command {
+        args: String,
+    }
+
+    let columns = [PickerColumn::new("command", |command: &Command, _| {
+        format!(":{}", command.args).into()
+    })];
+
+    let picker = Picker::new(columns, 0, items, (), |cx, option, _action| {
+        let args = option.args.clone();
+
+        cx.jobs.callback(async move {
+            let callback = |editor: &mut Editor, compositor: &mut Compositor| {
+                let prompt = command_mode_prompt().with_line(args, editor);
+
+                compositor.push(Box::new(prompt));
+            };
+
+            Ok(Callback::EditorCompositor(Box::new(callback)))
+        })
+    });
+
+    cx.push_layer(Box::new(overlaid(picker)));
+}
+
 fn jumplist_picker(cx: &mut Context) {
     struct JumpMeta {
         id: DocumentId,

helix-term/src/commands/typed.rs

@@ -3609,6 +3609,14 @@ pub(super) fn execute_command(
 
 #[allow(clippy::unnecessary_unwrap)]
 pub(super) fn command_mode(cx: &mut Context) {
+    let mut prompt = command_mode_prompt();
+
+    // Calculate initial completion
+    prompt.recalculate_completion(cx.editor);
+    cx.push_layer(Box::new(prompt));
+}
+
+pub(super) fn command_mode_prompt() -> Prompt {
     let mut prompt = Prompt::new(
         ":".into(),
         Some(':'),
@@ -3621,9 +3629,7 @@ pub(super) fn command_mode(cx: &mut Context) {
     );
     prompt.doc_fn = Box::new(command_line_doc);
 
-    // Calculate initial completion
-    prompt.recalculate_completion(cx.editor);
-    cx.push_layer(Box::new(prompt));
+    prompt
 }
 
 fn command_line_doc(input: &str) -> Option<Cow<str>> {

helix-term/src/keymap/default.rs

@@ -226,6 +226,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
             "E" => file_explorer_in_current_buffer_directory,
             "b" => buffer_picker,
             "j" => jumplist_picker,
+            ":" => command_history_picker,
             "s" => symbol_picker,
             "S" => workspace_symbol_picker,
             "d" => diagnostics_picker,