extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-12 15:48:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix shell-ring to rotate as expected

Browse Source
This commit is contained in:
Jonathan Turner
2019-08-19 19:29:27 +12:00
parent 095f4645c0
commit fef447a659
4 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/shell/shell_manager.rs
View File

@ -9,12 +9,14 @@ use std::sync::{Arc, Mutex};
#[derive(Clone, Debug)]
pub struct ShellManager {
crate current_shell: usize,
crate shells: Arc<Mutex<Vec<Box<dyn Shell + Send>>>>,
}
impl ShellManager {
pub fn basic(commands: CommandRegistry) -> Result<ShellManager, Box<dyn Error>> {
Ok(ShellManager {
current_shell: 0,
shells: Arc::new(Mutex::new(vec![Box::new(FilesystemShell::basic(
commands,
)?)])),
@ -23,11 +25,17 @@ impl ShellManager {
pub fn push(&mut self, shell: Box<dyn Shell + Send>) {
self.shells.lock().unwrap().push(shell);
self.current_shell = self.shells.lock().unwrap().len() - 1;
self.set_path(self.path());
}
pub fn pop(&mut self) {
self.shells.lock().unwrap().pop();
let new_len = self.shells.lock().unwrap().len();
if new_len > 0 {
self.current_shell = new_len - 1;
self.set_path(self.path());
}
}
pub fn is_empty(&self) -> bool {
@ -35,16 +43,11 @@ impl ShellManager {
}
pub fn path(&self) -> String {
self.shells.lock().unwrap().last().unwrap().path()
self.shells.lock().unwrap()[self.current_shell].path()
}
pub fn set_path(&mut self, path: String) {
self.shells
.lock()
.unwrap()
.last_mut()
.unwrap()
.set_path(path)
self.shells.lock().unwrap()[self.current_shell].set_path(path)
}
pub fn complete(
@ -53,37 +56,33 @@ impl ShellManager {
pos: usize,
ctx: &rustyline::Context<'_>,
) -> Result<(usize, Vec<rustyline::completion::Pair>), rustyline::error::ReadlineError> {
self.shells
.lock()
.unwrap()
.last()
.unwrap()
.complete(line, pos, ctx)
self.shells.lock().unwrap()[self.current_shell].complete(line, pos, ctx)
}
pub fn hint(&self, line: &str, pos: usize, ctx: &rustyline::Context<'_>) -> Option<String> {
self.shells
.lock()
.unwrap()
.last()
.unwrap()
.hint(line, pos, ctx)
self.shells.lock().unwrap()[self.current_shell].hint(line, pos, ctx)
}
pub fn next(&mut self) {
{
let mut x = self.shells.lock().unwrap();
let shell = x.remove(0);
x.push(shell);
let shell_len = self.shells.lock().unwrap().len();
if self.current_shell == (shell_len - 1) {
self.current_shell = 0;
} else {
self.current_shell += 1;
}
}
self.set_path(self.path());
}
pub fn prev(&mut self) {
{
let mut x = self.shells.lock().unwrap();
let shell = x.pop().unwrap();
x.insert(0, shell);
let shell_len = self.shells.lock().unwrap().len();
if self.current_shell == 0 {
self.current_shell = shell_len - 1;
} else {
self.current_shell -= 1;
}
}
self.set_path(self.path());
}
@ -91,11 +90,11 @@ impl ShellManager {
pub fn ls(&self, args: EvaluatedWholeStreamCommandArgs) -> Result<OutputStream, ShellError> {
let env = self.shells.lock().unwrap();
env.last().unwrap().ls(args)
env[self.current_shell].ls(args)
}
pub fn cd(&self, args: EvaluatedWholeStreamCommandArgs) -> Result<OutputStream, ShellError> {
let env = self.shells.lock().unwrap();
env.last().unwrap().cd(args)
env[self.current_shell].cd(args)
}
}