R: line endings and cleanup

Author: jonsequitur

samples/RenderingPlayground/Program.cs

@@ -43,31 +43,36 @@ public static void Main(
                                     height ?? Console.WindowHeight,
                                     overwrite);
 
+            var console = invocationContext.Console;
+
             if (overwrite && 
-                invocationContext.Console is ITerminal terminal)
+                console is ITerminal terminal)
             {
                 terminal.Clear();
             }
 
             var consoleRenderer = new ConsoleRenderer(
-                invocationContext.Console,
+                console,
                 mode: invocationContext.BindingContext.OutputMode(),
                 resetAfterRender: true);
 
             switch (sample)
             {
                 case SampleName.Colors:
                 {
-                    var screen = new ScreenView(renderer: consoleRenderer, invocationContext.Console);
+                    var screen = new ScreenView(renderer: consoleRenderer, console);
                     screen.Child = new ColorsView(text ?? "*");
 
                     screen.Render(region);
                 }
                     break;
 
                 case SampleName.Dir:
-                    var directoryTableView = new DirectoryTableView(new DirectoryInfo(Directory.GetCurrentDirectory()));
-                    directoryTableView.Render(consoleRenderer, region);
+                    
+                    var directoryTableView = new DirectoryTableView(
+                        new DirectoryInfo(Directory.GetCurrentDirectory()));
+
+                    console.Append(directoryTableView);
 
                     break;
 
@@ -94,14 +99,14 @@ public static void Main(
                     table.AddColumn(process => $"{process.ProcessName} ", "Name");
                     table.AddColumn(process => ContentView.FromObservable(process.TrackCpuUsage(), x => $"{x.UsageTotal:P}"), "CPU", ColumnDefinition.Star(1));
 
-                    var screen = new ScreenView(renderer: consoleRenderer, invocationContext.Console) { Child = table };
+                    var screen = new ScreenView(renderer: consoleRenderer, console) { Child = table };
                     screen.Render();
                 }
                     break;
 
                 case SampleName.Clock:
                 {
-                    var screen = new ScreenView(renderer: consoleRenderer, invocationContext.Console);
+                    var screen = new ScreenView(renderer: consoleRenderer, console);
                     var lastTime = DateTime.Now;
                     var clockObservable = new BehaviorSubject<DateTime>(lastTime);
                     var clockView = ContentView.FromObservable(clockObservable, x => $"{x:T}");
@@ -121,7 +126,7 @@ public static void Main(
 
                 case SampleName.GridLayout:
                 {
-                    var screen = new ScreenView(renderer: consoleRenderer, invocationContext.Console);
+                    var screen = new ScreenView(renderer: consoleRenderer, console);
                     var content = new ContentView(
                         "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum for Kevin.");
                     var smallContent = new ContentView("Kevin Bost");
@@ -159,7 +164,7 @@ public static void Main(
                     }
                     else
                     {
-                        var screen = new ScreenView(renderer: consoleRenderer, invocationContext.Console);
+                        var screen = new ScreenView(renderer: consoleRenderer, console);
                         var stackLayout = new StackLayoutView();
                         var content1 = new ContentView("Hello World!");
                         var content2 = new ContentView(

src/System.CommandLine.Rendering/AnsiRenderingSpanVisitor.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
+using System.CommandLine.IO;
 using static System.CommandLine.Rendering.Ansi;
 
 namespace System.CommandLine.Rendering
@@ -16,11 +17,20 @@ public AnsiRenderingSpanVisitor(
 
         protected override void SetCursorPosition(int? left = null, int? top = null)
         {
-            Writer.Write(
-                Cursor.Move
-                      .ToLocation(left: left + 1, top: top + 1)
-                      .EscapeSequence);
-
+            if (Region == Region.Scrolling)
+            {
+                Writer.WriteLine(
+                    Cursor.Move
+                          .ToLocation(left: left + 1)
+                          .EscapeSequence);
+            }
+            else
+            {
+                Writer.Write(
+                    Cursor.Move
+                          .ToLocation(left: left + 1, top: top + 1)
+                          .EscapeSequence);
+            }
         }
 
         public override void VisitForegroundColorSpan(ForegroundColorSpan span)
@@ -62,6 +72,7 @@ public override void VisitStyleSpan(StyleSpan span)
                 Writer.Write(controlCode.EscapeSequence);
             }
         }
+
         public override void VisitCursorControlSpan(CursorControlSpan cursorControlSpan)
         {
             if (_styleControlCodeMappings.TryGetValue(cursorControlSpan.Name, out var controlCode))
@@ -130,4 +141,4 @@ public override void VisitCursorControlSpan(CursorControlSpan cursorControlSpan)
                 [nameof(StyleSpan.UnderlinedOn)] = Ansi.Text.UnderlinedOn,
             };
     }
-}
+}

src/System.CommandLine.Rendering/EntireTerminalRegion.cs

@@ -17,19 +17,4 @@ public EntireTerminalRegion() : base(0, 0, Console.WindowWidth, Console.WindowHe
 
         public override int Left => Console.CursorLeft;
     }
-    
-    internal class ScrollingTerminalRegion : Region
-    {
-        public ScrollingTerminalRegion() : base(0, 0, Console.WindowWidth, Console.WindowHeight, false)
-        {
-        }
-
-        public override int Height => int.MaxValue;
-
-        public override int Width => Console.WindowWidth;
-
-        public override int Top => Console.CursorTop;
-
-        public override int Left => Console.CursorLeft;
-    }
 }

src/System.CommandLine.Rendering/FileRenderingSpanVisitor.cs

@@ -7,7 +7,6 @@ namespace System.CommandLine.Rendering
 {
     internal class FileRenderingSpanVisitor : ContentRenderingSpanVisitor
     {
-        // TODO: (FileRenderingSpanVisitor) rename: PlainTextRenderingSpanVisitor?
         public FileRenderingSpanVisitor(
             IStandardStreamWriter writer,
             Region region) : base(writer, region)

src/System.CommandLine.Rendering/Region.cs

@@ -12,8 +12,8 @@ public class Region
         public Region(
             int left,
             int top,
-            int width,
-            int height,
+            int? width = null,
+            int? height = null,
             bool isOverwrittenOnRender = true)
         {
             if (height < 0)
@@ -36,8 +36,14 @@ public Region(
                 throw new ArgumentOutOfRangeException(nameof(left));
             }
 
-            Height = height;
-            Width = width;
+            Height = height ??
+                     (Console.IsOutputRedirected
+                          ? 100
+                          : Console.WindowHeight);
+            Width = width ??
+                    (Console.IsOutputRedirected
+                         ? 100
+                         : Console.WindowWidth);
             Top = top;
             Left = left;
 

src/System.CommandLine.Rendering/ScrollingTerminalRegion.cs

@@ -0,0 +1,20 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace System.CommandLine.Rendering
+{
+    internal class ScrollingTerminalRegion : Region
+    {
+        public ScrollingTerminalRegion() : base(0, 0, isOverwrittenOnRender: false)
+        {
+        }
+
+        public override int Height => int.MaxValue;
+
+        public override int Width => Console.WindowWidth;
+
+        public override int Top => Console.CursorTop;
+
+        public override int Left => Console.CursorLeft;
+    }
+}

src/System.CommandLine.Tests/CommandTests.cs

@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.CommandLine.Binding;
+using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using FluentAssertions;
 using System.Linq;

src/System.CommandLine.Tests/ParserTests.cs

@@ -1998,7 +1998,7 @@ public CollectionWithCustomTypeConverter(IEnumerable<string> values)
 
             }
         }
-
+      
         public class CustomCollectionTypeConverter : TypeConverter
         {
             public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)