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

Upgrade reedline to latest dev version (#6778)

Browse Source 
* Reorder conditional deps for readability

* Pull reedline from the most recent main branch

* Map 'Submit' and 'SubmitOrNewline' events
  Introduced by nushell/reedline#490
This commit is contained in:
Stefan Holderbach 2022-10-16 23:51:15 +02:00 committed by GitHub
parent ce809881eb
commit 803f9d4daf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.lock generated
View File

@ -4071,8 +4071,7 @@ dependencies = [
[[package]] [[package]]
name = "reedline" name = "reedline"
version = "0.12.0" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/nushell/reedline.git?branch=main#f949f560f7bdd446a9f0af33baaf7298d2f3853a"
checksum = "311b256d0a325a92d685f1401fccf83341afba1a62d56bbfa3c98b87073db195"
dependencies = [ dependencies = [
"chrono", "chrono",
"crossterm 0.24.0", "crossterm 0.24.0",

17
Cargo.toml
View File

@ -64,6 +64,14 @@ time = "0.3.12"
openssl = { version = "0.10.38", features = ["vendored"], optional = true } openssl = { version = "0.10.38", features = ["vendored"], optional = true }
signal-hook = { version = "0.3.14", default-features = false } signal-hook = { version = "0.3.14", default-features = false }
[target.'cfg(windows)'.build-dependencies]
winres = "0.1"
[target.'cfg(target_family = "unix")'.dependencies]
nix = "0.24"
atty = "0.2"
[dev-dependencies] [dev-dependencies]
nu-test-support = { path="./crates/nu-test-support", version = "0.69.2" } nu-test-support = { path="./crates/nu-test-support", version = "0.69.2" }
tempfile = "3.2.0" tempfile = "3.2.0"
@ -74,9 +82,6 @@ hamcrest2 = "0.3.0"
rstest = {version = "0.15.0", default-features = false} rstest = {version = "0.15.0", default-features = false}
itertools = "0.10.3" itertools = "0.10.3"
[target.'cfg(windows)'.build-dependencies]
winres = "0.1"
[features] [features]
plugin = ["nu-plugin", "nu-cli/plugin", "nu-parser/plugin", "nu-command/plugin", "nu-protocol/plugin", "nu-engine/plugin"] plugin = ["nu-plugin", "nu-cli/plugin", "nu-parser/plugin", "nu-command/plugin", "nu-protocol/plugin", "nu-engine/plugin"]
extra = ["default", "dataframe", "database"] extra = ["default", "dataframe", "database"]
@ -122,7 +127,5 @@ debug = false
name = "nu" name = "nu"
path = "src/main.rs" path = "src/main.rs"
[target.'cfg(target_family = "unix")'.dependencies] [patch.crates-io]
nix = "0.24" reedline = { git = "https://github.com/nushell/reedline.git", branch = "main" }
atty = "0.2"

2
crates/nu-cli/src/reedline_config.rs
View File

@ -822,6 +822,8 @@ fn event_from_record(
"ctrld" => ReedlineEvent::CtrlD, "ctrld" => ReedlineEvent::CtrlD,
"ctrlc" => ReedlineEvent::CtrlC, "ctrlc" => ReedlineEvent::CtrlC,
"enter" => ReedlineEvent::Enter, "enter" => ReedlineEvent::Enter,
"submit" => ReedlineEvent::Submit,
"submitornewline" => ReedlineEvent::SubmitOrNewline,
"esc" | "escape" => ReedlineEvent::Esc, "esc" | "escape" => ReedlineEvent::Esc,
"up" => ReedlineEvent::Up, "up" => ReedlineEvent::Up,
"down" => ReedlineEvent::Down, "down" => ReedlineEvent::Down,