holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #238 from fdncred/allow_esc_q

Browse Source 
allow esc and q to get out of completions
This commit is contained in:
Darren Schroeder 2021-10-15 15:59:17 -05:00 committed by GitHub
commit 11070ffbbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main.rs
View File

@ -1,6 +1,10 @@
use std::{cell::RefCell, io::Write, rc::Rc}; use std::{cell::RefCell, io::Write, rc::Rc};
use dialoguer::{theme::ColorfulTheme, Select}; use dialoguer::{
console::{Style, Term},
theme::ColorfulTheme,
Select,
};
use miette::{IntoDiagnostic, Result}; use miette::{IntoDiagnostic, Result};
use nu_cli::{report_error, NuCompleter, NuHighlighter, NuValidator, NushellPrompt}; use nu_cli::{report_error, NuCompleter, NuHighlighter, NuValidator, NushellPrompt};
use nu_command::create_default_context; use nu_command::create_default_context;
@ -45,21 +49,27 @@ impl CompletionActionHandler for FuzzyCompletion {
let _ = crossterm::terminal::disable_raw_mode(); let _ = crossterm::terminal::disable_raw_mode();
println!(); println!();
let result = Select::with_theme(&ColorfulTheme::default()) let theme = ColorfulTheme {
active_item_style: Style::new().for_stderr().on_green().black(),
..Default::default()
};
let result = Select::with_theme(&theme)
.default(0) .default(0)
.items(&selections[..]) .items(&selections[..])
.interact() .interact_on_opt(&Term::stdout())
.unwrap(); .unwrap();
let _ = crossterm::terminal::enable_raw_mode(); let _ = crossterm::terminal::enable_raw_mode();
let span = completions[result].0; if let Some(result) = result {
let span = completions[result].0;
let mut offset = present_buffer.offset(); let mut offset = present_buffer.offset();
offset += completions[result].1.len() - (span.end - span.start); offset += completions[result].1.len() - (span.end - span.start);
// TODO improve the support for multiline replace // TODO improve the support for multiline replace
present_buffer.replace(span.start..span.end, &completions[result].1); present_buffer.replace(span.start..span.end, &completions[result].1);
present_buffer.set_insertion_point(offset); present_buffer.set_insertion_point(offset);
}
} }
} }
} }