extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-01 07:35:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove all previous usage of enter, shells, g, n and p

Browse Source 
This commit makes clippy happy.
This commit is contained in:
amtoine 2023-03-12 11:36:11 +01:00
parent c605fcb123
commit f27b9db6e3
No known key found for this signature in database
GPG Key ID: 37AAE9B486CFF1AB
3 changed files with 3 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/nu-command/src/default_context.rs
View File

@ -279,12 +279,7 @@ pub fn create_default_context() -> EngineState {
// Shells // Shells
bind_command! { bind_command! {
Enter,
Exit, Exit,
GotoShell,
NextShell,
PrevShell,
Shells,
}; };
// Formats // Formats

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

@ -1,5 +1,4 @@
use crate::filesystem::cd_query::query; use crate::filesystem::cd_query::query;
use crate::{get_current_shell, get_shells};
#[cfg(unix)] #[cfg(unix)]
use libc::gid_t; use libc::gid_t;
use nu_engine::{current_dir, CallExt}; use nu_engine::{current_dir, CallExt};
@ -164,23 +163,6 @@ impl Command for Cd {
val: path.clone(), val: path.clone(),
span, span,
}; };
let cwd = Value::string(cwd.to_string_lossy(), call.head);
let mut shells = get_shells(engine_state, stack, cwd);
let current_shell = get_current_shell(engine_state, stack);
shells[current_shell] = path_value.clone();
stack.add_env_var(
"NUSHELL_SHELLS".into(),
Value::List {
vals: shells,
span: call.head,
},
);
stack.add_env_var(
"NUSHELL_CURRENT_SHELL".into(),
Value::int(current_shell as i64, call.head),
);
if let Some(oldpwd) = stack.get_env_var(engine_state, "PWD") { if let Some(oldpwd) = stack.get_env_var(engine_state, "PWD") {
stack.add_env_var("OLDPWD".into(), oldpwd) stack.add_env_var("OLDPWD".into(), oldpwd)

50
crates/nu-command/src/shells/exit.rs
View File

@ -1,10 +1,7 @@
use super::{get_current_shell, get_last_shell, get_shells}; use nu_engine::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};
use nu_protocol::{ use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type};
Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
};
#[derive(Clone)] #[derive(Clone)]
pub struct Exit; pub struct Exit;
@ -55,48 +52,7 @@ impl Command for Exit {
std::process::exit(0); std::process::exit(0);
} }
let cwd = current_dir(engine_state, stack)?; std::process::exit(0);
let cwd = Value::string(cwd.to_string_lossy(), call.head);
let mut shells = get_shells(engine_state, stack, cwd);
let mut current_shell = get_current_shell(engine_state, stack);
let mut last_shell = get_last_shell(engine_state, stack);
shells.remove(current_shell);
if current_shell <= last_shell {
last_shell = 0;
}
if current_shell == shells.len() && !shells.is_empty() {
current_shell -= 1;
}
if shells.is_empty() {
std::process::exit(0);
} else {
let new_path = shells[current_shell].clone();
stack.add_env_var(
"NUSHELL_SHELLS".into(),
Value::List {
vals: shells,
span: call.head,
},
);
stack.add_env_var(
"NUSHELL_CURRENT_SHELL".into(),
Value::int(current_shell as i64, call.head),
);
stack.add_env_var(
"NUSHELL_LAST_SHELL".into(),
Value::int(last_shell as i64, call.head),
);
stack.add_env_var("PWD".into(), new_path);
Ok(PipelineData::empty())
}
} }
fn examples(&self) -> Vec<Example> { fn examples(&self) -> Vec<Example> {