Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-15 22:54:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

move keybinding_path to nu-data (#2927)

Browse source
This commit is contained in:
Anders Rasmussen 2021-01-14 04:31:47 +11:00 committed by GitHub
parent a9441d670e
commit ebc4694e05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/nu-cli/Cargo.toml
View file

@ -130,6 +130,6 @@ quickcheck_macros = "0.9.1"
[features] [features]
clipboard-cli = ["arboard"] clipboard-cli = ["arboard"]
rich-benchmark = ["heim"] rich-benchmark = ["heim"]
rustyline-support = ["rustyline"] rustyline-support = ["rustyline", "nu-engine/rustyline-support"]
stable = [] stable = []
trash-support = ["trash"] trash-support = ["trash"]

6
crates/nu-cli/src/keybinding.rs
View file

@ -405,14 +405,10 @@ pub struct Keybinding {
type Keybindings = Vec<Keybinding>; type Keybindings = Vec<Keybinding>;
pub(crate) fn keybinding_path() -> Result<std::path::PathBuf, nu_errors::ShellError> {
nu_data::config::default_path_for(&Some(std::path::PathBuf::from("keybindings.yml")))
}
pub(crate) fn load_keybindings( pub(crate) fn load_keybindings(
rl: &mut rustyline::Editor<crate::shell::Helper>, rl: &mut rustyline::Editor<crate::shell::Helper>,
) -> Result<(), nu_errors::ShellError> { ) -> Result<(), nu_errors::ShellError> {
let filename = keybinding_path()?; let filename = nu_data::keybinding::keybinding_path()?;
let contents = std::fs::read_to_string(filename); let contents = std::fs::read_to_string(filename);
// Silently fail if there is no file there // Silently fail if there is no file there

3
crates/nu-data/src/keybinding.rs Normal file
View file

@ -0,0 +1,3 @@
pub fn keybinding_path() -> Result<std::path::PathBuf, nu_errors::ShellError> {
crate::config::default_path_for(&Some(std::path::PathBuf::from("keybindings.yml")))
}

1
crates/nu-data/src/lib.rs
View file

@ -2,6 +2,7 @@ pub mod base;
pub mod command; pub mod command;
pub mod config; pub mod config;
pub mod dict; pub mod dict;
pub mod keybinding;
pub mod primitive; pub mod primitive;
pub mod types; pub mod types;
pub mod utils; pub mod utils;

3
crates/nu-engine/Cargo.toml
View file

@ -48,3 +48,6 @@ users = "0.10.0"
[dev-dependencies] [dev-dependencies]
nu-test-support = {version = "0.25.2", path = "../nu-test-support"} nu-test-support = {version = "0.25.2", path = "../nu-test-support"}
[features]
rustyline-support = []

2
crates/nu-engine/src/evaluate/variables.rs
View file

@ -47,7 +47,7 @@ pub fn nu(env: &IndexMap<String, String>, tag: impl Into<Tag>) -> Result<Value,
#[cfg(feature = "rustyline-support")] #[cfg(feature = "rustyline-support")]
{ {
let keybinding_path = crate::keybinding::keybinding_path()?; let keybinding_path = nu_data::keybinding::keybinding_path()?;
nu_dict.insert_value( nu_dict.insert_value(
"keybinding-path", "keybinding-path",
UntaggedValue::filepath(keybinding_path).into_value(&tag), UntaggedValue::filepath(keybinding_path).into_value(&tag),