Add support for quick completions (#927)

This commit is contained in:
JT 2022-02-04 10:30:21 -05:00 committed by GitHub
parent 1a246d141e
commit 522a53af68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 1 deletions

2
Cargo.lock generated
View File

@ -3277,7 +3277,7 @@ dependencies = [
[[package]] [[package]]
name = "reedline" name = "reedline"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/nushell/reedline?branch=main#375c779e360cd368bb75e583986eec856853bbf2" source = "git+https://github.com/nushell/reedline?branch=main#e4cec995262fc85fab3e08cad267e28a3da60460"
dependencies = [ dependencies = [
"chrono", "chrono",
"crossterm", "crossterm",

View File

@ -23,6 +23,7 @@ members = [
[dependencies] [dependencies]
reedline = { git = "https://github.com/nushell/reedline", branch = "main" } reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
crossterm = "0.22.*" crossterm = "0.22.*"
nu-cli = { path="./crates/nu-cli" } nu-cli = { path="./crates/nu-cli" }
nu-command = { path="./crates/nu-command" } nu-command = { path="./crates/nu-command" }

View File

@ -15,5 +15,6 @@ nu-color-config = { path = "../nu-color-config" }
miette = { version = "3.0.0", features = ["fancy"] } miette = { version = "3.0.0", features = ["fancy"] }
thiserror = "1.0.29" thiserror = "1.0.29"
reedline = { git = "https://github.com/nushell/reedline", branch = "main" } reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
log = "0.4" log = "0.4"
is_executable = "1.0.1" is_executable = "1.0.1"

View File

@ -59,6 +59,7 @@ pub struct Config {
pub float_precision: i64, pub float_precision: i64,
pub filesize_format: String, pub filesize_format: String,
pub use_ansi_coloring: bool, pub use_ansi_coloring: bool,
pub quick_completions: bool,
pub env_conversions: HashMap<String, EnvConversion>, pub env_conversions: HashMap<String, EnvConversion>,
pub edit_mode: String, pub edit_mode: String,
pub max_history_size: i64, pub max_history_size: i64,
@ -81,6 +82,7 @@ impl Default for Config {
float_precision: 4, float_precision: 4,
filesize_format: "auto".into(), filesize_format: "auto".into(),
use_ansi_coloring: true, use_ansi_coloring: true,
quick_completions: false,
env_conversions: HashMap::new(), // TODO: Add default conversoins env_conversions: HashMap::new(), // TODO: Add default conversoins
edit_mode: "emacs".into(), edit_mode: "emacs".into(),
max_history_size: 1000, max_history_size: 1000,
@ -185,6 +187,13 @@ impl Value {
eprintln!("$config.use_ansi_coloring is not a bool") eprintln!("$config.use_ansi_coloring is not a bool")
} }
} }
"quick_completions" => {
if let Ok(b) = value.as_bool() {
config.quick_completions = b;
} else {
eprintln!("$config.quick_completions is not a bool")
}
}
"filesize_format" => { "filesize_format" => {
if let Ok(v) = value.as_string() { if let Ok(v) = value.as_string() {
config.filesize_format = v.to_lowercase(); config.filesize_format = v.to_lowercase();

View File

@ -107,6 +107,7 @@ pub(crate) fn evaluate(engine_state: &mut EngineState) -> Result<()> {
engine_state: engine_state.clone(), engine_state: engine_state.clone(),
})) }))
.with_completer(Box::new(NuCompleter::new(engine_state.clone()))) .with_completer(Box::new(NuCompleter::new(engine_state.clone())))
.with_quick_completions(config.quick_completions)
.with_ansi_colors(config.use_ansi_coloring); .with_ansi_colors(config.use_ansi_coloring);
line_editor = add_completion_menu(line_editor, &config); line_editor = add_completion_menu(line_editor, &config);