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

Fix push/pop for shell manager

Browse Source
This commit is contained in:
Jonathan Turner 2019-08-19 20:07:55 +12:00
parent fef447a659
commit 953d28ef74
3 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/commands/classified.rs
View File

@ -140,19 +140,21 @@ impl InternalCommand {
} }
CommandAction::Exit => std::process::exit(0), CommandAction::Exit => std::process::exit(0),
CommandAction::EnterValueShell(value) => { CommandAction::EnterValueShell(value) => {
context.shell_manager.push(Box::new(ValueShell::new(value))); context
.shell_manager
.insert_at_current(Box::new(ValueShell::new(value)));
} }
CommandAction::EnterShell(location) => { CommandAction::EnterShell(location) => {
let path = std::path::Path::new(&location); let path = std::path::Path::new(&location);
if path.is_dir() { if path.is_dir() {
// If it's a directory, add a new filesystem shell // If it's a directory, add a new filesystem shell
context context.shell_manager.insert_at_current(Box::new(
.shell_manager FilesystemShell::with_location(
.push(Box::new(FilesystemShell::with_location(
location, location,
context.registry().clone(), context.registry().clone(),
)?)); )?,
));
} else { } else {
// If it's a file, attempt to open the file as a value and enter it // If it's a file, attempt to open the file as a value and enter it
let cwd = context.shell_manager.path(); let cwd = context.shell_manager.path();
@ -180,11 +182,13 @@ impl InternalCommand {
Span::unknown(), Span::unknown(),
)?; )?;
context.shell_manager.push(Box::new(ValueShell::new(value))); context
.shell_manager
.insert_at_current(Box::new(ValueShell::new(value)));
} }
value => context value => context.shell_manager.insert_at_current(Box::new(
.shell_manager ValueShell::new(value.tagged(contents_tag)),
.push(Box::new(ValueShell::new(value.tagged(contents_tag)))), )),
} }
} }
} }
@ -195,7 +199,7 @@ impl InternalCommand {
context.shell_manager.next(); context.shell_manager.next();
} }
CommandAction::LeaveShell => { CommandAction::LeaveShell => {
context.shell_manager.pop(); context.shell_manager.remove_at_current();
if context.shell_manager.is_empty() { if context.shell_manager.is_empty() {
std::process::exit(0); std::process::exit(0);
} }

25
src/shell/shell_manager.rs
View File

@ -23,19 +23,30 @@ impl ShellManager {
}) })
} }
pub fn push(&mut self, shell: Box<dyn Shell + Send>) { pub fn insert_at_current(&mut self, shell: Box<dyn Shell + Send>) {
self.shells.lock().unwrap().push(shell); self.shells.lock().unwrap().push(shell);
self.current_shell = self.shells.lock().unwrap().len() - 1; self.current_shell = self.shells.lock().unwrap().len() - 1;
self.set_path(self.path()); self.set_path(self.path());
} }
pub fn pop(&mut self) { pub fn remove_at_current(&mut self) {
self.shells.lock().unwrap().pop(); {
let new_len = self.shells.lock().unwrap().len(); let mut shells = self.shells.lock().unwrap();
if new_len > 0 { if shells.len() > 0 {
self.current_shell = new_len - 1; if self.current_shell == shells.len() - 1 {
self.set_path(self.path()); shells.pop();
let new_len = shells.len();
if new_len > 0 {
self.current_shell = new_len - 1;
} else {
return;
}
} else {
shells.remove(self.current_shell);
}
}
} }
self.set_path(self.path());
} }
pub fn is_empty(&self) -> bool { pub fn is_empty(&self) -> bool {

2
tests/command_enter_test.rs
View File

@ -45,9 +45,11 @@ fn knows_the_filesystems_entered() {
n n
mv andres.nu ../expected/andres.nu mv andres.nu ../expected/andres.nu
exit exit
n
cd .. cd ..
rm red_pill --recursive rm red_pill --recursive
exit exit
n
rm blue_pill --recursive rm blue_pill --recursive
exit exit
"# "#