Merge branch 'master' into implement-whole-stream-command-for-all-commands

This commit is contained in:
Jonathan Turner
2019-08-20 16:13:49 +12:00
8 changed files with 71 additions and 50 deletions

View File

@ -27,12 +27,10 @@ fn shells(args: CommandArgs, _registry: &CommandRegistry) -> Result<OutputStream
let mut shells_out = VecDeque::new();
let span = args.call_info.name_span;
let shells_len = args.shell_manager.shells.lock().unwrap().len();
for (index, shell) in args.shell_manager.shells.lock().unwrap().iter().enumerate() {
let mut dict = TaggedDictBuilder::new(Tag::unknown_origin(span));
if index == (shells_len - 1) {
if index == args.shell_manager.current_shell {
dict.insert(" ", "X".to_string());
} else {
dict.insert(" ", " ".to_string());