From c5981b6c021fcbb96f19dfe36111dd073b13d627 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 17 Mar 2022 05:55:32 -0500 Subject: [PATCH] fix(cli): Consistently space stacks Fixes #206 --- src/bin/git-stack/stack.rs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/bin/git-stack/stack.rs b/src/bin/git-stack/stack.rs index 44189ca..42fe859 100644 --- a/src/bin/git-stack/stack.rs +++ b/src/bin/git-stack/stack.rs @@ -1177,6 +1177,9 @@ impl<'r> Tree<'r> { } tree.push(stack_tree); } else { + if i != 0 && !stack.is_empty() { + tree.push(termtree::Tree::root(joint).with_glyphs(SPACE_GLYPHS)); + } for child_tree in stack.into_iter() { let child = RenderNode { repo, @@ -1261,6 +1264,14 @@ const GLYPHS: termtree::GlyphPalette = termtree::GlyphPalette { ..termtree::GlyphPalette::new() }; +const SPACE_GLYPHS: termtree::GlyphPalette = termtree::GlyphPalette { + middle_item: "│", + last_item: " ", + item_indent: " ", + skip_indent: " ", + ..termtree::GlyphPalette::new() +}; + const JOINT_GLYPHS: termtree::GlyphPalette = termtree::GlyphPalette { item_indent: "─┐", ..termtree::GlyphPalette::new()