fix: Use space glyphs from the right layer

Author: epage

src/lib.rs

@@ -123,13 +123,8 @@ impl<D: Display> Display for Tree<D> {
                 for line in root.lines() {
                     // print single line
                     for s in spaces.as_slice() {
-                        if *s {
-                            self.glyphs.last_skip.fmt(f)?;
-                            self.glyphs.skip_indent.fmt(f)?;
-                        } else {
-                            self.glyphs.middle_skip.fmt(f)?;
-                            self.glyphs.skip_indent.fmt(f)?;
-                        }
+                        s.skip.fmt(f)?;
+                        s.indent.fmt(f)?;
                     }
                     prefix.0.fmt(f)?;
                     prefix.1.fmt(f)?;
@@ -140,13 +135,8 @@ impl<D: Display> Display for Tree<D> {
             } else {
                 // print single line
                 for s in spaces.as_slice() {
-                    if *s {
-                        self.glyphs.last_skip.fmt(f)?;
-                        self.glyphs.skip_indent.fmt(f)?;
-                    } else {
-                        self.glyphs.middle_skip.fmt(f)?;
-                        self.glyphs.skip_indent.fmt(f)?;
-                    }
+                    s.skip.fmt(f)?;
+                    s.indent.fmt(f)?;
                 }
                 prefix.0.fmt(f)?;
                 prefix.1.fmt(f)?;
@@ -156,9 +146,13 @@ impl<D: Display> Display for Tree<D> {
 
             // recurse
             if !leaf.leaves.is_empty() {
-                let s: &Vec<bool> = &spaces;
+                let s: &Vec<SpacePalette> = &spaces;
                 let mut child_spaces = s.clone();
-                child_spaces.push(last);
+                child_spaces.push(if last {
+                    leaf.glyphs.last_space()
+                } else {
+                    leaf.glyphs.middle_space()
+                });
                 let child_spaces = Rc::new(child_spaces);
                 enqueue_leaves(&mut queue, leaf, child_spaces);
             }
@@ -167,19 +161,25 @@ impl<D: Display> Display for Tree<D> {
     }
 }
 
-type DisplauQueue<'t, D> = VecDeque<(bool, &'t Tree<D>, Rc<Vec<bool>>)>;
+type DisplauQueue<'t, D> = VecDeque<(bool, &'t Tree<D>, Rc<Vec<SpacePalette>>)>;
 
 fn enqueue_leaves<'t, D: Display>(
     queue: &mut DisplauQueue<'t, D>,
     parent: &'t Tree<D>,
-    spaces: Rc<Vec<bool>>,
+    spaces: Rc<Vec<SpacePalette>>,
 ) {
     for (i, leaf) in parent.leaves.iter().rev().enumerate() {
         let last = i == 0;
         queue.push_front((last, leaf, spaces.clone()));
     }
 }
 
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+struct SpacePalette {
+    skip: &'static str,
+    indent: &'static str,
+}
+
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct GlyphPalette {
     pub middle_item: &'static str,
@@ -203,6 +203,20 @@ impl GlyphPalette {
             skip_indent: "   ",
         }
     }
+
+    fn middle_space(&self) -> SpacePalette {
+        SpacePalette {
+            skip: self.middle_skip,
+            indent: self.skip_indent,
+        }
+    }
+
+    fn last_space(&self) -> SpacePalette {
+        SpacePalette {
+            skip: self.last_skip,
+            indent: self.skip_indent,
+        }
+    }
 }
 
 impl Default for GlyphPalette {

src/tests.rs

@@ -106,17 +106,17 @@ node 1
 ├── node 1.1
 ├── node 1.2
 ├── node 1.3
-[mskip][iskip  ](mid  )(indent )node 1.3.1
-[mskip][iskip  ](mid  )(indent )node 1.3.2
-[mskip][iskip  ](last )(indent )node 1.3.3
-[mskip][iskip  ][lskip][iskip  ]├── node 1.3.3.1
-[mskip][iskip  ][lskip][iskip  ]└── node 1.3.3.2
+│   (mid  )(indent )node 1.3.1
+│   (mid  )(indent )node 1.3.2
+│   (last )(indent )node 1.3.3
+│   (lskip)(iskip  )├── node 1.3.3.1
+│   (lskip)(iskip  )└── node 1.3.3.2
 └── node 1.4
-[lskip][iskip  ]├── node 1.4.1
-[lskip][iskip  ]├── node 1.4.2
-[lskip][iskip  ]└── node 1.4.3
-[lskip][iskip  ][lskip][iskip  ]├── node 1.4.3.1
-[lskip][iskip  ][lskip][iskip  ]└── node 1.4.3.2
+    ├── node 1.4.1
+    ├── node 1.4.2
+    └── node 1.4.3
+        ├── node 1.4.3.1
+        └── node 1.4.3.2
 
 "#]]
     );