Fixed render issue where writeline inside status caused corrupt output #415 #694

fredrikbentzen · patriksvensson · commit 71a5d8306712 · 2023-06-04T20:31:12.000+02:00
diff --git a/src/Spectre.Console/Live/LiveRenderable.cs b/src/Spectre.Console/Live/LiveRenderable.cs
@@ -49,7 +49,7 @@ public IRenderable PositionCursor()
             }
 
             var linesToMoveUp = _shape.Value.Height - 1;
-            return new ControlCode("\r" + CUU(linesToMoveUp));
+            return new ControlCode("\r" + (EL(2) + CUU(1)).Repeat(linesToMoveUp));
         }
     }
 
diff --git a/test/Spectre.Console.Tests/Expectations/Live/Status/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Live/Status/Render.Output.verified.txt
@@ -1,10 +1,10 @@
 [?25l     
 [38;5;11m*[0m foo
      
-[2A     
+[2K[1A[2K[1A     
 [38;5;11m-[0m bar
      
-[2A     
+[2K[1A[2K[1A     
 [38;5;11m*[0m baz
      
 [2K[1A[2K[1A[2K[?25h
diff --git a/test/Spectre.Console.Tests/Expectations/Live/Status/WriteLineOverflow.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Live/Status/WriteLineOverflow.Output.verified.txt
@@ -0,0 +1,12 @@
+﻿[?25l                                                    
+[38;5;11m⣷[0m long text that should not interfere writeline text
+                                                    
+[2K[1A[2K[1A[38;5;15mxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx[0m
+[38;5;15mxxxxxxxxxx[0m
+                                                    
+[38;5;11m⣷[0m long text that should not interfere writeline text
+                                                    
+[2K[1A[2K[1A                                                    
+[38;5;11m⣷[0m long text that should not interfere writeline text
+                                                    
+[2K[1A[2K[1A[2K[?25h
diff --git a/test/Spectre.Console.Tests/Unit/Live/StatusTests.cs b/test/Spectre.Console.Tests/Unit/Live/StatusTests.cs
@@ -49,4 +49,30 @@ public Task Should_Render_Status_Correctly()
         // Then
         return Verifier.Verify(console.Output);
     }
+
+    [Fact]
+    [Expectation("WriteLineOverflow")]
+    public Task Should_Render_Correctly_When_WriteLine_Exceeds_Console_Width()
+    {
+        // Given
+        var console = new TestConsole()
+            .Colors(ColorSystem.TrueColor)
+            .Width(100)
+            .Interactive()
+            .EmitAnsiSequences();
+        var status = new Status(console)
+        {
+            AutoRefresh = false,
+        };
+
+        // When
+        status.Start("long text that should not interfere writeline text", ctx =>
+        {
+            ctx.Refresh();
+            console.WriteLine("x".Repeat(console.Profile.Width + 10), new Style(foreground: Color.White));
+        });
+
+        // Then
+        return Verifier.Verify(console.Output);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public IRenderable PositionCursor()`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`var linesToMoveUp = _shape.Value.Height - 1;`
`52`		`- return new ControlCode("\r" + CUU(linesToMoveUp));`
	`52`	`+ return new ControlCode("\r" + (EL(2) + CUU(1)).Repeat(linesToMoveUp));`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
-Original file line number
+Diff line change
@@ @@ -1,10 +1,10 @@ @@
 [?25l
 [38;5;11m*[0m foo
 -[2A
 +[2K[1A[2K[1A
 [38;5;11m-[0m bar
 -[2A
 +[2K[1A[2K[1A
 [38;5;11m*[0m baz
 [2K[1A[2K[1A[2K[?25h
-Original file line number
+Diff line change
@@ @@ -0,0 +1,12 @@ @@
 +[?25l
 +[38;5;11m⣷[0m long text that should not interfere writeline text
++
 +[2K[1A[2K[1A[38;5;15mxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx[0m
 +[38;5;15mxxxxxxxxxx[0m
++
 +[38;5;11m⣷[0m long text that should not interfere writeline text
++
 +[2K[1A[2K[1A
 +[38;5;11m⣷[0m long text that should not interfere writeline text
++
 +[2K[1A[2K[1A[2K[?25h