holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

export get_shells and get_current_shell (#6236)

Browse Source 
Signed-off-by: nibon7 <nibon7@163.com>
This commit is contained in:
nibon7 2022-08-05 20:58:40 +08:00 committed by GitHub
parent cc99df5ef1
commit 692376e830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/nu-command/src/filesystem/cd.rs
View File

@ -1,4 +1,5 @@
use crate::filesystem::cd_query::query; use crate::filesystem::cd_query::query;
use crate::{get_current_shell, get_shells};
use nu_engine::{current_dir, CallExt}; use nu_engine::{current_dir, CallExt};
use nu_protocol::ast::Call; use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack}; use nu_protocol::engine::{Command, EngineState, Stack};
@ -146,22 +147,8 @@ impl Command for Cd {
span: call.head, span: call.head,
}; };
let shells = stack.get_env_var(engine_state, "NUSHELL_SHELLS"); let mut shells = get_shells(engine_state, stack, cwd);
let mut shells = if let Some(v) = shells { let current_shell = get_current_shell(engine_state, stack);
v.as_list()
.map(|x| x.to_vec())
.unwrap_or_else(|_| vec![cwd])
} else {
vec![cwd]
};
let current_shell = stack.get_env_var(engine_state, "NUSHELL_CURRENT_SHELL");
let current_shell = if let Some(v) = current_shell {
v.as_integer().unwrap_or_default() as usize
} else {
0
};
shells[current_shell] = path_value.clone(); shells[current_shell] = path_value.clone();
stack.add_env_var( stack.add_env_var(

4
crates/nu-command/src/shells/mod.rs
View File

@ -14,7 +14,7 @@ use nu_protocol::Value;
pub use p::PrevShell; pub use p::PrevShell;
pub use shells_::Shells; pub use shells_::Shells;
fn get_shells(engine_state: &EngineState, stack: &mut Stack, cwd: Value) -> Vec<Value> { pub fn get_shells(engine_state: &EngineState, stack: &mut Stack, cwd: Value) -> Vec<Value> {
let shells = stack.get_env_var(engine_state, "NUSHELL_SHELLS"); let shells = stack.get_env_var(engine_state, "NUSHELL_SHELLS");
let shells = if let Some(v) = shells { let shells = if let Some(v) = shells {
v.as_list() v.as_list()
@ -26,7 +26,7 @@ fn get_shells(engine_state: &EngineState, stack: &mut Stack, cwd: Value) -> Vec<
shells shells
} }
fn get_current_shell(engine_state: &EngineState, stack: &mut Stack) -> usize { pub fn get_current_shell(engine_state: &EngineState, stack: &mut Stack) -> usize {
let current_shell = stack.get_env_var(engine_state, "NUSHELL_CURRENT_SHELL"); let current_shell = stack.get_env_var(engine_state, "NUSHELL_CURRENT_SHELL");
if let Some(v) = current_shell { if let Some(v) = current_shell {
v.as_integer().unwrap_or_default() as usize v.as_integer().unwrap_or_default() as usize