From b157102e52e7add49641eb6757e49e0d25b30e2a Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Tue, 2 Sep 2025 03:22:36 -0600
Subject: [PATCH] fix: Handle window close for lines with no annotations

---
 examples/multislice.svg                   |  6 ++--
 src/renderer/mod.rs                       | 10 +++++++
 tests/color/ann_multiline2.term.svg       |  4 ++-
 tests/color/multiple_annotations.term.svg |  4 ++-
 tests/formatter.rs                        | 36 +++++++++++++++++++++++
 5 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/examples/multislice.svg b/examples/multislice.svg
index 5bc01454..47c98bc1 100644
--- a/examples/multislice.svg
+++ b/examples/multislice.svg
@@ -1,4 +1,4 @@
-<svg width="740px" height="182px" xmlns="http://www.w3.org/2000/svg">
+<svg width="740px" height="200px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { background: #000000 }
@@ -35,7 +35,9 @@
 </tspan>
     <tspan x="10px" y="154px"><tspan class="fg-bright-blue bold">129</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan> Faa</tspan>
 </tspan>
-    <tspan x="10px" y="172px">
+    <tspan x="10px" y="172px"><tspan>    </tspan><tspan class="fg-bright-blue bold">|</tspan>
+</tspan>
+    <tspan x="10px" y="190px">
 </tspan>
   </text>
 
diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
index f776c232..d45347bc 100644
--- a/src/renderer/mod.rs
+++ b/src/renderer/mod.rs
@@ -1004,6 +1004,16 @@ impl Renderer {
             margin,
         );
 
+        // If there are no annotations, we are done
+        if line_info.annotations.is_empty() {
+            // `close_window` normally gets handled later, but we are early
+            // returning, so it needs to be handled here
+            if close_window {
+                self.draw_col_separator_end(buffer, line_offset + 1, width_offset - 2);
+            }
+            return vec![];
+        }
+
         // Special case when there's only one annotation involved, it is the start of a multiline
         // span and there's no text at the beginning of the code line. Instead of doing the whole
         // graph:
diff --git a/tests/color/ann_multiline2.term.svg b/tests/color/ann_multiline2.term.svg
index 2f7eb902..36b94e14 100644
--- a/tests/color/ann_multiline2.term.svg
+++ b/tests/color/ann_multiline2.term.svg
@@ -1,4 +1,4 @@
-<svg width="740px" height="164px" xmlns="http://www.w3.org/2000/svg">
+<svg width="740px" height="182px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { background: #000000 }
@@ -34,6 +34,8 @@
     <tspan x="10px" y="136px"><tspan>   </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan> </tspan><tspan class="fg-bright-red bold">|_^</tspan><tspan> </tspan><tspan class="fg-bright-red bold">this should not be on separate lines</tspan>
 </tspan>
     <tspan x="10px" y="154px"><tspan class="fg-bright-blue bold">28</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan>   to exactly one character on next line.</tspan>
+</tspan>
+    <tspan x="10px" y="172px"><tspan>   </tspan><tspan class="fg-bright-blue bold">|</tspan>
 </tspan>
   </text>
 
diff --git a/tests/color/multiple_annotations.term.svg b/tests/color/multiple_annotations.term.svg
index 2c5c4a81..a98d6fa8 100644
--- a/tests/color/multiple_annotations.term.svg
+++ b/tests/color/multiple_annotations.term.svg
@@ -1,4 +1,4 @@
-<svg width="768px" height="272px" xmlns="http://www.w3.org/2000/svg">
+<svg width="768px" height="290px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { background: #000000 }
@@ -46,6 +46,8 @@
     <tspan x="10px" y="244px"><tspan class="fg-bright-blue bold">103</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan>     }</tspan>
 </tspan>
     <tspan x="10px" y="262px"><tspan class="fg-bright-blue bold">104</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan> }</tspan>
+</tspan>
+    <tspan x="10px" y="280px"><tspan>    </tspan><tspan class="fg-bright-blue bold">|</tspan>
 </tspan>
   </text>
 
diff --git a/tests/formatter.rs b/tests/formatter.rs
index e12e848e..a39fd1b1 100644
--- a/tests/formatter.rs
+++ b/tests/formatter.rs
@@ -194,6 +194,7 @@ error:
      |
 5402 | This is line 1
 5403 | This is line 2
+     |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -203,6 +204,7 @@ error:
      ╭▸ 
 5402 │ This is line 1
 5403 │ This is line 2
+     ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -234,6 +236,7 @@ error:
     ::: file2.rs:2
      |
    2 | This is slice 2
+     |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -247,6 +250,7 @@ error:
      ⸬  file2.rs:2
      │
    2 │ This is slice 2
+     ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -340,6 +344,7 @@ error:
    |
 56 | This is an example
 57 | of content lines
+   |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -349,6 +354,7 @@ error:
    ╭▸ 
 56 │ This is an example
 57 │ of content lines
+   ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -427,6 +433,7 @@ error:
  --> file.rs
   |
 1 |
+  |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -436,6 +443,7 @@ error:
   ╭▸ file.rs
   │
 1 │
+  ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -456,6 +464,7 @@ LL | This is an example
 LL | of content lines
 LL |
 LL | abc
+   |
 "#]];
     let renderer = Renderer::plain().anonymized_line_numbers(true);
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -467,6 +476,7 @@ LL │ This is an example
 LL │ of content lines
 LL │
 LL │ abc
+   ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -561,6 +571,7 @@ error:
 3 | a
   | ^
 4 | b
+  |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -572,6 +583,7 @@ error:
 3 │ a
   │ ━
 4 │ b
+  ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -629,6 +641,7 @@ error:
 2 | | にちは
   | |_^
 3 |   世界
+  |
 "#]];
 
     let renderer = Renderer::plain();
@@ -643,6 +656,7 @@ error:
 2 │ ┃ にちは
   │ ┗━┛
 3 │   世界
+  ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -699,6 +713,7 @@ error:
 3 | a
   |  ^
 4 | b
+  |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -710,6 +725,7 @@ error:
 3 │ a
   │  ━
 4 │ b
+  ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -803,6 +819,7 @@ error:
 3 | a
   |  ^
 4 | b
+  |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -814,6 +831,7 @@ error:
 3 │ a
   │  ━
 4 │ b
+  ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -838,6 +856,7 @@ error:
 2 | | にちは
   | |_^
 3 |   世界
+  |
 "#]];
 
     let renderer = Renderer::plain();
@@ -852,6 +871,7 @@ error:
 2 │ ┃ にちは
   │ ┗━┛
 3 │   世界
+  ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -981,6 +1001,7 @@ error:
 2 | | にちは
   | |__^
 3 |   世界
+  |
 "#]];
 
     let renderer = Renderer::plain();
@@ -995,6 +1016,7 @@ error:
 2 │ ┃ にちは
   │ ┗━━┛
 3 │   世界
+  ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -1057,6 +1079,7 @@ error:
 4 | | b
   | |__^
 5 |   c
+  |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -1070,6 +1093,7 @@ error:
 4 │ ┃ b
   │ ┗━━┛
 5 │   c
+  ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -1444,6 +1468,7 @@ error: title
 3 | ccc
   | ^^^ annotation
 4 | ddd
+  |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -1457,6 +1482,7 @@ error: title
 3 │ ccc
   │ ━━━ annotation
 4 │ ddd
+  ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -1487,6 +1513,7 @@ error: title
 3 | ccc
   |  ^^ annotation
 4 | ddd
+  |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -1500,6 +1527,7 @@ error: title
 3 │ ccc
   │  ━━ annotation
 4 │ ddd
+  ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -3467,6 +3495,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
 12 | crazy
 13 | quack
 14 | zappy
+   |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -3482,6 +3511,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
 12 │ crazy
 13 │ quack
 14 │ zappy
+   ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -3505,6 +3535,7 @@ fn empty_span_start_line() {
    | ^ E112
 10 | #: E113
 11 | print()
+   |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -3517,6 +3548,7 @@ fn empty_span_start_line() {
    │ ━ E112
 10 │ #: E113
 11 │ print()
+   ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -3973,6 +4005,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
    | ^^^^^
 ...
 18 | zappy
+   |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -3984,6 +4017,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
    │ ━━━━━
    ‡
 18 │ zappy
+   ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
@@ -4019,6 +4053,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
    | ^^^^^
 13 | fuzzy
 14 | pizza
+   |
 "#]];
     let renderer = Renderer::plain();
     assert_data_eq!(renderer.render(input), expected_ascii);
@@ -4030,6 +4065,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
    │ ━━━━━
 13 │ fuzzy
 14 │ pizza
+   ╰╴
 "#]];
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);