extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-25 01:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 68 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Cargo.lock generated
View File

@ -502,9 +502,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
[[package]]
name = "byte-unit"
version = "5.1.3"
version = "5.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbda27216be70d08546aa506cecabce0c5eb0d494aaaedbd7ec82c8ae1a60b46"
checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e"
dependencies = [
"rust_decimal",
"serde",
@ -541,9 +541,9 @@ checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205"
[[package]]
name = "bytemuck"
version = "1.14.0"
version = "1.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9"
dependencies = [
"bytemuck_derive",
]
@ -658,9 +658,9 @@ dependencies = [
[[package]]
name = "chrono"
version = "0.4.31"
version = "0.4.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a"
dependencies = [
"android-tzdata",
"iana-time-zone",
@ -669,7 +669,7 @@ dependencies = [
"pure-rust-locales",
"serde",
"wasm-bindgen",
"windows-targets 0.48.5",
"windows-targets 0.52.0",
]
[[package]]
@ -715,9 +715,9 @@ dependencies = [
[[package]]
name = "ciborium"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
dependencies = [
"ciborium-io",
"ciborium-ll",
@ -726,15 +726,15 @@ dependencies = [
[[package]]
name = "ciborium-io"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
[[package]]
name = "ciborium-ll"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
dependencies = [
"ciborium-io",
"half",
@ -1729,9 +1729,13 @@ dependencies = [
[[package]]
name = "half"
version = "1.8.2"
version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872"
dependencies = [
"cfg-if",
"crunchy",
]
[[package]]
name = "halfbrown"
@ -2399,9 +2403,9 @@ dependencies = [
[[package]]
name = "lscolors"
version = "0.16.0"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab0b209ec3976527806024406fe765474b9a1750a0ed4b8f0372364741f50e7b"
checksum = "53304fff6ab1e597661eee37e42ea8c47a146fca280af902bb76bff8a896e523"
dependencies = [
"nu-ansi-term",
]
@ -2802,9 +2806,9 @@ dependencies = [
[[package]]
name = "nu-ansi-term"
version = "0.49.0"
version = "0.50.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68"
checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14"
dependencies = [
"windows-sys 0.48.0",
]
@ -4646,7 +4650,7 @@ dependencies = [
[[package]]
name = "reedline"
version = "0.28.0"
source = "git+https://github.com/nushell/reedline?branch=main#d9db6a84b70d182c11c1a657d363c914eb3921d1"
source = "git+https://github.com/nushell/reedline?branch=main#3bee07cfbdad31f25727d1a57839f2e9c7444f03"
dependencies = [
"arboard",
"chrono",
@ -4687,9 +4691,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.10.2"
version = "1.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
dependencies = [
"aho-corasick",
"memchr",
@ -4699,9 +4703,9 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.4.3"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
dependencies = [
"aho-corasick",
"memchr",
@ -6176,9 +6180,9 @@ dependencies = [
[[package]]
name = "uucore"
version = "0.0.23"
version = "0.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "068748c7f682cf123dc52c2dbfb61447214c27f5566bfe7cd7225156a39bf7f2"
checksum = "d5de2eba1364f6274f35f121eb8671b98ac5fa8fe1271694721e17034e85e8bc"
dependencies = [
"clap",
"dunce",
@ -6196,9 +6200,9 @@ dependencies = [
[[package]]
name = "uucore_procs"
version = "0.0.23"
version = "0.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de9aca849d872044129960e8ace8eaad30aa64bd0346a561b7aaace20f5fcd18"
checksum = "3eb9aeeb06d1f15c5b3b51acddddf3436e3e1480902b2a200618ca5dbb24e392"
dependencies = [
"proc-macro2",
"quote",
@ -6207,9 +6211,9 @@ dependencies = [
[[package]]
name = "uuhelp_parser"
version = "0.0.23"
version = "0.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e269065dd0e7d561fb4c16fc0ef754c6da9333ccab08d6eda770dc6e2575aff0"
checksum = "d841f8408028085ca65896cdd60b9925d4e407cb69989a64889f2bebbb51147b"
[[package]]
name = "uuid"
@ -6228,9 +6232,9 @@ checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c"
[[package]]
name = "value-trait"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea87257cfcbedcb9444eda79c59fdfea71217e6305afee8ee33f500375c2ac97"
checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4"
dependencies = [
"float-cmp",
"halfbrown",

2
Cargo.toml
View File

@ -77,7 +77,7 @@ nu-term-grid = { path = "./crates/nu-term-grid", version = "0.89.1" }
nu-std = { path = "./crates/nu-std", version = "0.89.1" }
nu-utils = { path = "./crates/nu-utils", version = "0.89.1" }
nu-ansi-term = "0.49.0"
nu-ansi-term = "0.50.0"
reedline = { version = "0.28.0", features = ["bashisms", "sqlite"] }
crossterm = "0.27"

2
crates/nu-cli/Cargo.toml
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" }

3
crates/nu-cli/src/completions/command_completions.rs
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,

2
crates/nu-cli/src/completions/completer.rs
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,

1
crates/nu-cli/src/completions/directory_completions.rs
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,

1
crates/nu-cli/src/completions/dotnu_completions.rs
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,

1
crates/nu-cli/src/completions/file_completions.rs
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,

2
crates/nu-cli/src/completions/flag_completions.rs
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,

7
crates/nu-cli/src/completions/variable_completions.rs
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,

1
crates/nu-cli/src/menus/help_completions.rs
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(),

2
crates/nu-cli/src/menus/menu_completions.rs
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 {

2
crates/nu-cmd-extra/Cargo.toml
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"

2
crates/nu-cmd-lang/Cargo.toml
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"

2
crates/nu-color-config/Cargo.toml
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" }

4
crates/nu-command/Cargo.toml
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"

4
crates/nu-explore/Cargo.toml
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"] }

2
crates/nu-pretty-hex/Cargo.toml
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 }

2
crates/nu-table/Cargo.toml
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 }

2
crates/nu-utils/Cargo.toml
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"