extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-07-01 07:00:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bind fuzzy history search to Ctrl-R

Browse Source
This commit is contained in:
Pirmin Kalberer
2019-09-16 22:48:22 +02:00
parent 44b7e07569
commit 1e3549571c
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cli.rs
View File

@ -10,6 +10,7 @@ use crate::context::Context;
use crate::data::Value;
pub(crate) use crate::errors::ShellError;
use crate::git::current_branch;
use crate::histsearch;
use crate::parser::registry::Signature;
use crate::parser::{hir, CallNode, Pipeline, PipelineElement, TokenNode};
use crate::prelude::*;
@ -333,6 +334,12 @@ pub async fn cli() -> Result<(), Box<dyn Error>> {
rl.set_edit_mode(edit_mode);
// Register Ctrl-r for history fuzzy search
// rustyline doesn't support custom commands, so we override Ctrl-D (EOF)
rl.bind_sequence(rustyline::KeyPress::Ctrl('R'), rustyline::Cmd::EndOfFile);
// Redefine Ctrl-D to same command as Ctrl-C
rl.bind_sequence(rustyline::KeyPress::Ctrl('D'), rustyline::Cmd::Interrupt);
let readline = rl.readline(&format!(
"{}{}> ",
cwd,
@ -347,6 +354,12 @@ pub async fn cli() -> Result<(), Box<dyn Error>> {
rl.add_history_entry(line.clone());
}
LineResult::SearchHist => {
let hist = std::fs::read_to_string("history.txt").expect("Cannot open history.txt");
let lines = hist.lines().rev().collect();
histsearch::select_from_list(&lines);
}
LineResult::CtrlC => {
if ctrlcbreak {
std::process::exit(0);
@ -390,6 +403,7 @@ pub async fn cli() -> Result<(), Box<dyn Error>> {
enum LineResult {
Success(String),
SearchHist,
Error(String, ShellError),
CtrlC,
Break,
@ -517,7 +531,7 @@ async fn process_line(readline: Result<String, ReadlineError>, ctx: &mut Context
LineResult::Success(line.clone())
}
Err(ReadlineError::Interrupted) => LineResult::CtrlC,
Err(ReadlineError::Eof) => LineResult::Break,
Err(ReadlineError::Eof) => LineResult::SearchHist, // Override LineResult::Break
Err(err) => {
println!("Error: {:?}", err);
LineResult::Break