update nu-ansi-term to 0.50, lscolors to 0.17, and add the Style attribute to Suggestion (#11635)

* update nu-ansi-term to 0.50.0
* update lscolors to 0.17.0
* add the Style attribute to Suggestion
* bump Reedline to the latest main
This commit is contained in:
Michael Angerman
2024-01-24 20:57:15 -08:00
committed by GitHub
parent 2a65d43c13
commit f286286510
20 changed files with 68 additions and 44 deletions

View File

@ -24,7 +24,7 @@ nu-parser = { path = "../nu-parser", version = "0.89.1" }
nu-protocol = { path = "../nu-protocol", version = "0.89.1" }
nu-utils = { path = "../nu-utils", version = "0.89.1" }
nu-color-config = { path = "../nu-color-config", version = "0.89.1" }
nu-ansi-term = "0.49.0"
nu-ansi-term = "0.50.0"
reedline = { version = "0.28.0", features = ["bashisms", "sqlite"] }
chrono = { default-features = false, features = ["std"], version = "0.4" }

View File

@ -94,6 +94,7 @@ impl CommandCompletion {
.map(move |x| Suggestion {
value: String::from_utf8_lossy(&x.0).to_string(),
description: x.1,
style: None,
extra: None,
span: reedline::Span::new(span.start - offset, span.end - offset),
append_whitespace: true,
@ -110,6 +111,7 @@ impl CommandCompletion {
.map(move |x| Suggestion {
value: x,
description: None,
style: None,
extra: None,
span: reedline::Span::new(span.start - offset, span.end - offset),
append_whitespace: true,
@ -123,6 +125,7 @@ impl CommandCompletion {
results.push(Suggestion {
value: format!("^{}", external.value),
description: None,
style: None,
extra: None,
span: external.span,
append_whitespace: true,

View File

@ -465,6 +465,7 @@ pub fn map_value_completions<'a>(
return Some(Suggestion {
value: s,
description: None,
style: None,
extra: None,
span: reedline::Span {
start: span.start - offset,
@ -479,6 +480,7 @@ pub fn map_value_completions<'a>(
let mut suggestion = Suggestion {
value: String::from(""), // Initialize with empty string
description: None,
style: None,
extra: None,
span: reedline::Span {
start: span.start - offset,

View File

@ -44,6 +44,7 @@ impl Completer for DirectoryCompletion {
.map(move |x| Suggestion {
value: x.1,
description: None,
style: None,
extra: None,
span: reedline::Span {
start: x.0.start - offset,

View File

@ -111,6 +111,7 @@ impl Completer for DotNuCompletion {
.map(move |x| Suggestion {
value: x.1,
description: None,
style: None,
extra: None,
span: reedline::Span {
start: x.0.start - offset,

View File

@ -49,6 +49,7 @@ impl Completer for FileCompletion {
.map(move |x| Suggestion {
value: x.1,
description: None,
style: None,
extra: None,
span: reedline::Span {
start: x.0.start - offset,

View File

@ -46,6 +46,7 @@ impl Completer for FlagCompletion {
output.push(Suggestion {
value: String::from_utf8_lossy(&named).to_string(),
description: Some(flag_desc.to_string()),
style: None,
extra: None,
span: reedline::Span {
start: span.start - offset,
@ -68,6 +69,7 @@ impl Completer for FlagCompletion {
output.push(Suggestion {
value: String::from_utf8_lossy(&named).to_string(),
description: Some(flag_desc.to_string()),
style: None,
extra: None,
span: reedline::Span {
start: span.start - offset,

View File

@ -95,6 +95,7 @@ impl Completer for VariableCompletion {
output.push(Suggestion {
value: env_var.0,
description: None,
style: None,
extra: None,
span: current_span,
append_whitespace: false,
@ -165,6 +166,7 @@ impl Completer for VariableCompletion {
output.push(Suggestion {
value: builtin.to_string(),
description: None,
style: None,
extra: None,
span: current_span,
append_whitespace: false,
@ -187,6 +189,7 @@ impl Completer for VariableCompletion {
output.push(Suggestion {
value: String::from_utf8_lossy(v.0).to_string(),
description: None,
style: None,
extra: None,
span: current_span,
append_whitespace: false,
@ -208,6 +211,7 @@ impl Completer for VariableCompletion {
output.push(Suggestion {
value: String::from_utf8_lossy(v.0).to_string(),
description: None,
style: None,
extra: None,
span: current_span,
append_whitespace: false,
@ -239,6 +243,7 @@ fn nested_suggestions(
output.push(Suggestion {
value: col,
description: None,
style: None,
extra: None,
span: current_span,
append_whitespace: false,
@ -253,6 +258,7 @@ fn nested_suggestions(
output.push(Suggestion {
value: column_name.to_string(),
description: None,
style: None,
extra: None,
span: current_span,
append_whitespace: false,
@ -266,6 +272,7 @@ fn nested_suggestions(
output.push(Suggestion {
value: column_name,
description: None,
style: None,
extra: None,
span: current_span,
append_whitespace: false,

View File

@ -102,6 +102,7 @@ impl NuHelpCompleter {
Suggestion {
value: sig.name.clone(),
description: Some(long_desc),
style: None,
extra: Some(extra),
span: reedline::Span {
start: pos - line.len(),

View File

@ -146,6 +146,7 @@ fn convert_to_suggestions(
vec![Suggestion {
value: text,
description,
style: None,
extra,
span,
append_whitespace: false,
@ -158,6 +159,7 @@ fn convert_to_suggestions(
_ => vec![Suggestion {
value: format!("Not a record: {value:?}"),
description: None,
style: None,
extra: None,
span: reedline::Span {
start: if only_buffer_difference {

View File

@ -23,7 +23,7 @@ nu-utils = { path = "../nu-utils", version = "0.89.1" }
heck = "0.4.1"
num-traits = "0.2"
ahash = "0.8.3"
nu-ansi-term = "0.49.0"
nu-ansi-term = "0.50.0"
fancy-regex = "0.12.0"
rust-embed = "8.2.0"
serde = "1.0.164"

View File

@ -16,7 +16,7 @@ nu-engine = { path = "../nu-engine", version = "0.89.1" }
nu-parser = { path = "../nu-parser", version = "0.89.1" }
nu-protocol = { path = "../nu-protocol", version = "0.89.1" }
nu-utils = { path = "../nu-utils", version = "0.89.1" }
nu-ansi-term = "0.49.0"
nu-ansi-term = "0.50.0"
fancy-regex = "0.12"
itertools = "0.12"

View File

@ -12,7 +12,7 @@ bench = false
[dependencies]
nu-protocol = { path = "../nu-protocol", version = "0.89.1" }
nu-ansi-term = "0.49.0"
nu-ansi-term = "0.50.0"
nu-utils = { path = "../nu-utils", version = "0.89.1" }
nu-engine = { path = "../nu-engine", version = "0.89.1" }
nu-json = { path = "../nu-json", version = "0.89.1" }

View File

@ -13,7 +13,7 @@ version = "0.89.1"
bench = false
[dependencies]
nu-ansi-term = "0.49.0"
nu-ansi-term = "0.50.0"
nu-cmd-base = { path = "../nu-cmd-base", version = "0.89.1" }
nu-color-config = { path = "../nu-color-config", version = "0.89.1" }
nu-engine = { path = "../nu-engine", version = "0.89.1" }
@ -51,7 +51,7 @@ indexmap = "2.1"
indicatif = "0.17"
itertools = "0.12"
log = "0.4"
lscolors = { version = "0.16", default-features = false, features = ["nu-ansi-term"] }
lscolors = { version = "0.17", default-features = false, features = ["nu-ansi-term"] }
md5 = { package = "md-5", version = "0.10" }
miette = { version = "5.10", features = ["fancy-no-backtrace"] }
mime = "0.3"

View File

@ -11,7 +11,7 @@ version = "0.89.1"
bench = false
[dependencies]
nu-ansi-term = "0.49.0"
nu-ansi-term = "0.50.0"
nu-protocol = { path = "../nu-protocol", version = "0.89.1" }
nu-parser = { path = "../nu-parser", version = "0.89.1" }
nu-color-config = { path = "../nu-color-config", version = "0.89.1" }
@ -26,4 +26,4 @@ crossterm = "0.27"
ratatui = "0.23"
ansi-str = "0.8"
unicode-width = "0.1"
lscolors = { version = "0.16", default-features = false, features = ["nu-ansi-term"] }
lscolors = { version = "0.17", default-features = false, features = ["nu-ansi-term"] }

View File

@ -14,7 +14,7 @@ path = "src/lib.rs"
bench = false
[dependencies]
nu-ansi-term = "0.49.0"
nu-ansi-term = "0.50.0"
[dev-dependencies]
heapless = { version = "0.8", default-features = false }

View File

@ -15,7 +15,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.89.1" }
nu-utils = { path = "../nu-utils", version = "0.89.1" }
nu-engine = { path = "../nu-engine", version = "0.89.1" }
nu-color-config = { path = "../nu-color-config", version = "0.89.1" }
nu-ansi-term = "0.49.0"
nu-ansi-term = "0.50.0"
once_cell = "1.18"
fancy-regex = "0.12"
tabled = { version = "0.14.0", features = ["color"], default-features = false }

View File

@ -18,7 +18,7 @@ bench = false
[dependencies]
log = "0.4"
lscolors = { version = "0.16", default-features = false, features = ["nu-ansi-term"] }
lscolors = { version = "0.17", default-features = false, features = ["nu-ansi-term"] }
num-format = { version = "0.4" }
strip-ansi-escapes = "0.2.0"
sys-locale = "0.3"