Fix first entry and exit field rendering

oli-obk · oli-obk · commit 1ba511bed8c3 · 2024-07-12T09:50:15.000Z
diff --git a/examples/basic.stdout b/examples/basic.stdout
@@ -1,5 +1,5 @@
-1:main┐basic::hierarchical-example
-1:main┐ version=0.1
+1:main┬─┬─ basic::hierarchical-example
+1:main│ └─ version=0.1
 1:main└┬─┬─ basic::hierarchical-example
 1:main │ └─ version=0.1
 1:main └┬─┬─ basic::server
@@ -88,5 +88,5 @@
 1:main │ └─ port=8080
 1:main┌┴┬─ basic::hierarchical-example
 1:main│ └─ version=0.1
-1:main┘basic::hierarchical-example
-1:main┘ version=0.1
+1:main┴┬─ basic::hierarchical-example
+1:main └─ version=0.1
diff --git a/examples/basic_non_verbose.stdout b/examples/basic_non_verbose.stdout
@@ -1,5 +1,5 @@
-1:main┐basic_non_verbose::hierarchical-example
-1:main┐ version=0.1
+1:main┬─┬─ basic_non_verbose::hierarchical-example
+1:main│ └─ version=0.1
 1:main└─┬─┬─ basic_non_verbose::server
 1:main  │ ├─ host="localhost"
 1:main  │ └─ port=8080
diff --git a/examples/basic_verbose_entry.stdout b/examples/basic_verbose_entry.stdout
@@ -1,5 +1,5 @@
-1:main┐basic_verbose_entry::hierarchical-example
-1:main┐ version=0.1
+1:main┬─┬─ basic_verbose_entry::hierarchical-example
+1:main│ └─ version=0.1
 1:main└┬─┬─ basic_verbose_entry::hierarchical-example
 1:main │ └─ version=0.1
 1:main └┬─┬─ basic_verbose_entry::server
diff --git a/examples/basic_verbose_exit.stdout b/examples/basic_verbose_exit.stdout
@@ -1,5 +1,5 @@
-1:main┐basic_verbose_exit::hierarchical-example
-1:main┐ version=0.1
+1:main┬─┬─ basic_verbose_exit::hierarchical-example
+1:main│ └─ version=0.1
 1:main└─┬─┬─ basic_verbose_exit::server
 1:main  │ ├─ host="localhost"
 1:main  │ └─ port=8080
@@ -71,5 +71,5 @@
 1:main │ └─ port=8080
 1:main┌┴┬─ basic_verbose_exit::hierarchical-example
 1:main│ └─ version=0.1
-1:main┘basic_verbose_exit::hierarchical-example
-1:main┘ version=0.1
+1:main┴┬─ basic_verbose_exit::hierarchical-example
+1:main └─ version=0.1
diff --git a/examples/concurrent.stdout b/examples/concurrent.stdout
@@ -1,5 +1,5 @@
-1:main┐concurrent::hierarchical-example
-1:main┐ version=0.1
+1:main┬───┬─── concurrent::hierarchical-example
+1:main│   └─ version=0.1
 1:main└───┬───┬─── concurrent::server
 1:main    │   ├─ host="localhost"
 1:main    │   └─ port=8080
diff --git a/examples/concurrent_eager.stdout b/examples/concurrent_eager.stdout
@@ -1,20 +1,20 @@
-1:main┐concurrent_eager::spawn_fut
-1:main┐ key="a"
-1:main┐concurrent_eager::spawn_fut
-1:main┐ key="b"
-1:main┐concurrent_eager::spawn_fut
-1:main┐ key="a"
+1:main┬───┬─── concurrent_eager::spawn_fut
+1:main│   └─ key="a"
+1:main┬───┬─── concurrent_eager::spawn_fut
+1:main│   └─ key="b"
+1:main┬───┬─── concurrent_eager::spawn_fut
+1:main│   └─ key="a"
 1:main└───┐concurrent_eager::a
-1:main┐concurrent_eager::spawn_fut
-1:main┐ key="b"
+1:main┬───┬─── concurrent_eager::spawn_fut
+1:main│   └─ key="b"
 1:main└───┐concurrent_eager::b
-1:main┐concurrent_eager::spawn_fut
-1:main┐ key="a"
+1:main┬───┬─── concurrent_eager::spawn_fut
+1:main│   └─ key="a"
 1:main└───┐concurrent_eager::a
 1:main    ├─── INFO concurrent_eager a
 1:main┌───┘
-1:main┐concurrent_eager::spawn_fut
-1:main┐ key="b"
+1:main┬───┬─── concurrent_eager::spawn_fut
+1:main│   └─ key="b"
 1:main└───┐concurrent_eager::b
 1:main    ├─── INFO concurrent_eager b
 1:main┌───┘
diff --git a/examples/concurrent_verbose.stdout b/examples/concurrent_verbose.stdout
@@ -1,5 +1,5 @@
-1:main┐concurrent_verbose::hierarchical-example
-1:main┐ version=0.1
+1:main┬───┬─── concurrent_verbose::hierarchical-example
+1:main│   └─ version=0.1
 1:main└───┬───┬─── concurrent_verbose::server
 1:main    │   ├─ host="localhost"
 1:main    │   └─ port=8080
@@ -60,5 +60,5 @@
 1:main   │   └─ port=8080
 1:main┌─┴──┬─── concurrent_verbose::hierarchical-example
 1:main  │   └─ version=0.1
-1:main┘concurrent_verbose::hierarchical-example
-1:main┘ version=0.1
+1:main┴──┬─── concurrent_verbose::hierarchical-example
+1:main └─ version=0.1
diff --git a/examples/deferred.stdout b/examples/deferred.stdout
@@ -1,6 +1,6 @@
 -> This prints before the span open message
-1:main┐open: deferred::hierarchical-example
-1:main┐ version=0.1
+1:main┬─┬─ open: deferred::hierarchical-example
+1:main│ └─ version=0.1
 1:main└─┬─┬─ open: deferred::server
 1:main  │ ├─ host="localhost"
 1:main  │ └─ port=8080
@@ -77,5 +77,5 @@
 1:main │ └─ port=8080
 1:main┌┴┬─ post_close: deferred::hierarchical-example
 1:main│ └─ version=0.1
-1:main┘close(v): deferred::hierarchical-example
-1:main┘ version=0.1
+1:main┴┬─ close(v): deferred::hierarchical-example
+1:main └─ version=0.1
diff --git a/examples/quiet.stdout b/examples/quiet.stdout
@@ -1,5 +1,5 @@
-1:main┐quiet::hierarchical-example
-1:main┐ version=0.1
+1:main┬─┬─ quiet::hierarchical-example
+1:main│ └─ version=0.1
 1:main└─┬─┬─ quiet::server
 1:main  │ ├─ host="localhost"
 1:main  │ └─ port=8080
diff --git a/examples/wraparound.stdout b/examples/wraparound.stdout
@@ -1,5 +1,5 @@
-1:main┐wraparound::recurse
-1:main┐ i=0
+1:main┬─┬─ wraparound::recurse
+1:main│ └─ i=0
 1:main├─ WARN wraparound boop
 1:main└─┬─┬─ wraparound::recurse
 1:main  │ └─ i=1
@@ -14,8 +14,8 @@
 1:main        │ └─ i=4
 1:main────────┘
 1:main WARN wraparound boop
-1:main┐wraparound::recurse
-1:main┐ i=5
+1:main┬─┬─ wraparound::recurse
+1:main│ └─ i=5
 1:main├─ WARN wraparound boop
 1:main└─┬─┬─ wraparound::recurse
 1:main  │ └─ i=6
@@ -30,8 +30,8 @@
 1:main        │ └─ i=9
 1:main────────┘
 1:main WARN wraparound boop
-1:main┐wraparound::recurse
-1:main┐ i=10
+1:main┬─┬─ wraparound::recurse
+1:main│ └─ i=10
 1:main├─ WARN wraparound boop
 1:main└─┬─┬─ wraparound::recurse
 1:main  │ └─ i=11
@@ -46,8 +46,8 @@
 1:main        │ └─ i=14
 1:main────────┘
 1:main WARN wraparound boop
-1:main┐wraparound::recurse
-1:main┐ i=15
+1:main┬─┬─ wraparound::recurse
+1:main│ └─ i=15
 1:main├─ WARN wraparound boop
 1:main└─┬─┬─ wraparound::recurse
 1:main  │ └─ i=16
@@ -62,8 +62,8 @@
 1:main        │ └─ i=19
 1:main────────┘
 1:main WARN wraparound boop
-1:main┐wraparound::recurse
-1:main┐ i=20
+1:main┬─┬─ wraparound::recurse
+1:main│ └─ i=20
 1:main├─ WARN wraparound boop
 1:main└─┬─┬─ wraparound::recurse
 1:main  │ └─ i=21
diff --git a/src/format.rs b/src/format.rs
@@ -335,29 +335,12 @@ fn indent_block_with_lines(
 
     if lines.is_empty() {
         return;
-    } else if indent_spaces == 0 {
-        for line in lines {
-            buf.push_str(prefix);
-            // The first indent is special, we only need to print open/close and nothing else
-            if indent == 0 {
-                match style {
-                    SpanMode::Open { .. } => buf.push_str(LINE_OPEN),
-                    SpanMode::Retrace { .. } => buf.push_str(LINE_OPEN),
-                    SpanMode::Close { .. } => buf.push_str(LINE_CLOSE),
-                    SpanMode::PreOpen { .. } | SpanMode::PostClose => {}
-                    SpanMode::Event => {}
-                }
-            }
-            buf.push_str(line);
-            buf.push('\n');
-        }
-        return;
     }
 
     let mut s = String::with_capacity(indent_spaces + prefix.len());
     s.push_str(prefix);
 
-    for _ in 0..(indent_spaces - indent_amount) {
+    for _ in 0..indent_spaces.saturating_sub(indent_amount) {
         s.push(' ');
     }
 
@@ -388,9 +371,11 @@ fn indent_block_with_lines(
             }
         }
         SpanMode::Open { verbose: false } | SpanMode::Retrace { verbose: false } => {
-            buf.push(LINE_OPEN2);
-            for _ in 1..indent_amount {
-                buf.push_str(LINE_HORIZ);
+            if indent_spaces != 0 {
+                buf.push(LINE_OPEN2);
+                for _ in 1..indent_amount {
+                    buf.push_str(LINE_HORIZ);
+                }
             }
             if lines.len() > 1 {
                 buf.push_str(ARGS_BRANCH);
@@ -401,25 +386,30 @@ fn indent_block_with_lines(
                 for _ in 1..indent_amount {
                     buf.push_str(LINE_HORIZ);
                 }
-                buf.push_str(" ");
-                for _ in 0..indent_amount {
-                    s.push(' ');
+                buf.push(' ');
+
+                if indent_spaces != 0 {
+                    for _ in 0..indent_amount {
+                        s.push(' ');
+                    }
                 }
             } else {
                 buf.push_str(LINE_OPEN);
             }
         }
         SpanMode::Open { verbose: true } | SpanMode::Retrace { verbose: true } => {
-            buf.push(' ');
-            for _ in 1..(indent_amount / 2) {
+            if indent_spaces != 0 {
                 buf.push(' ');
-            }
-            // We don't have the space for fancy rendering at single space indent.
-            if indent_amount > 1 {
-                buf.push(LINE_OPEN2);
-            }
-            for _ in (indent_amount / 2)..(indent_amount - 1) {
-                buf.push_str(LINE_HORIZ);
+                for _ in 1..(indent_amount / 2) {
+                    buf.push(' ');
+                }
+                // We don't have the space for fancy rendering at single space indent.
+                if indent_amount > 1 {
+                    buf.push(LINE_OPEN2);
+                }
+                for _ in (indent_amount / 2)..(indent_amount - 1) {
+                    buf.push_str(LINE_HORIZ);
+                }
             }
             // We don't have the space for fancy rendering at single space indent.
             if indent_amount > 1 {
@@ -432,9 +422,11 @@ fn indent_block_with_lines(
                     for _ in 1..indent_amount {
                         buf.push_str(LINE_HORIZ);
                     }
-                    buf.push_str(" ");
-                    for _ in 0..indent_amount {
-                        s.push(' ');
+                    buf.push(' ');
+                    if indent_spaces != 0 {
+                        for _ in 0..indent_amount {
+                            s.push(' ');
+                        }
                     }
                 } else {
                     buf.push_str(LINE_OPEN);
@@ -444,23 +436,27 @@ fn indent_block_with_lines(
             }
         }
         SpanMode::Close { verbose: false } => {
-            buf.push(LINE_CLOSE2);
-            for _ in 1..indent_amount {
-                buf.push_str(LINE_HORIZ);
+            if indent_spaces != 0 {
+                buf.push(LINE_CLOSE2);
+                for _ in 1..indent_amount {
+                    buf.push_str(LINE_HORIZ);
+                }
             }
             buf.push_str(LINE_CLOSE);
         }
         SpanMode::Close { verbose: true } => {
-            buf.push(' ');
-            for _ in 1..(indent_amount / 2) {
+            if indent_spaces != 0 {
                 buf.push(' ');
-            }
-            // We don't have the space for fancy rendering at single space indent.
-            if indent_amount > 1 {
-                buf.push(LINE_CLOSE2);
-            }
-            for _ in (indent_amount / 2)..(indent_amount - 1) {
-                buf.push_str(LINE_HORIZ);
+                for _ in 1..(indent_amount / 2) {
+                    buf.push(' ');
+                }
+                // We don't have the space for fancy rendering at single space indent.
+                if indent_amount > 1 {
+                    buf.push(LINE_CLOSE2);
+                }
+                for _ in (indent_amount / 2)..(indent_amount - 1) {
+                    buf.push_str(LINE_HORIZ);
+                }
             }
             // We don't have the space for fancy rendering at single space indent.
             if indent_amount > 1 {
@@ -473,9 +469,12 @@ fn indent_block_with_lines(
                     for _ in 1..indent_amount {
                         buf.push_str(LINE_HORIZ);
                     }
-                    buf.push_str(" ");
-                    for _ in 0..indent_amount - 1 {
-                        s.push(' ');
+                    buf.push(' ');
+
+                    if indent_spaces != 0 {
+                        for _ in 0..indent_amount - 1 {
+                            s.push(' ');
+                        }
                     }
                 } else {
                     buf.push_str(LINE_CLOSE);
@@ -507,31 +506,44 @@ fn indent_block_with_lines(
             }
         }
         SpanMode::Event => {
-            buf.push_str(LINE_BRANCH);
+            if indent_spaces != 0 {
+                buf.push_str(LINE_BRANCH);
+            }
             if lines.len() > 1 {
-                for _ in 0..(indent_amount - 1) {
-                    buf.push_str(LINE_HORIZ);
+                if indent_spaces != 0 {
+                    for _ in 0..(indent_amount - 1) {
+                        buf.push_str(LINE_HORIZ);
+                    }
                 }
                 buf.push_str(ARGS_BRANCH);
             }
 
-            // add `indent_amount - 1` horizontal lines before the span/event
-            for _ in 0..(indent_amount - 1) {
-                buf.push_str(LINE_HORIZ);
+            if indent_spaces != 0 {
+                // add `indent_amount - 1` horizontal lines before the span/event
+                for _ in 0..(indent_amount - 1) {
+                    buf.push_str(LINE_HORIZ);
+                }
             }
         }
     }
     buf.push_str(lines[0]);
     buf.push('\n');
 
-    // add the rest of the indentation, since we don't want to draw horizontal lines
-    // for subsequent lines
-    for i in 0..indent_amount {
-        if i % indent_amount == 0 {
-            s.push_str(LINE_VERT);
-        } else {
+    match style {
+        SpanMode::Close { verbose: true } if indent_spaces == 0 => {
             s.push(' ');
         }
+        _ => {
+            // add the rest of the indentation, since we don't want to draw horizontal lines
+            // for subsequent lines
+            for i in 0..indent_amount {
+                if i % indent_amount == 0 {
+                    s.push_str(LINE_VERT);
+                } else {
+                    s.push(' ');
+                }
+            }
+        }
     }
 
     // add all of the actual content, with each line preceded by the indent string
