diff --git a/examples/Cli/Demo/Utilities/SettingsDumper.cs b/examples/Cli/Demo/Utilities/SettingsDumper.cs index f46d5cf..3533372 100644 --- a/examples/Cli/Demo/Utilities/SettingsDumper.cs +++ b/examples/Cli/Demo/Utilities/SettingsDumper.cs @@ -23,7 +23,7 @@ namespace Demo.Utilities value ?? "[grey]null[/]"); } - AnsiConsole.Render(table); + AnsiConsole.Write(table); } } } diff --git a/examples/Console/Borders/Program.cs b/examples/Console/Borders/Program.cs index a0dc06a..b9612f2 100644 --- a/examples/Console/Borders/Program.cs +++ b/examples/Console/Borders/Program.cs @@ -35,7 +35,7 @@ namespace Spectre.Console.Examples CreatePanel("None", BoxBorder.None), }; - AnsiConsole.Render( + AnsiConsole.Write( new Padder( new Columns(items).PadRight(2), new Padding(2,0,0,0))); @@ -77,13 +77,13 @@ namespace Spectre.Console.Examples CreateTable("Markdown", TableBorder.Markdown), }; - AnsiConsole.Render(new Columns(items).Collapse()); + AnsiConsole.Write(new Columns(items).Collapse()); } private static void HorizontalRule(string title) { AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule($"[white bold]{title}[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Rule($"[white bold]{title}[/]").RuleStyle("grey").LeftAligned()); AnsiConsole.WriteLine(); } } diff --git a/examples/Console/Calendars/Program.cs b/examples/Console/Calendars/Program.cs index fbe2311..b4a6be3 100644 --- a/examples/Console/Calendars/Program.cs +++ b/examples/Console/Calendars/Program.cs @@ -5,7 +5,7 @@ namespace Spectre.Console.Examples public static void Main(string[] args) { AnsiConsole.WriteLine(); - AnsiConsole.Render(new Calendar(2020, 10) + AnsiConsole.Write(new Calendar(2020, 10) .RoundedBorder() .HighlightStyle(Style.Parse("red")) .HeaderStyle(Style.Parse("yellow")) diff --git a/examples/Console/Canvas/Program.cs b/examples/Console/Canvas/Program.cs index 0e2ce7e..b7fad39 100644 --- a/examples/Console/Canvas/Program.cs +++ b/examples/Console/Canvas/Program.cs @@ -39,9 +39,9 @@ namespace Spectre.Console.Examples private static void Render(IRenderable canvas, string title) { AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule($"[yellow]{title}[/]").LeftAligned().RuleStyle("grey")); + AnsiConsole.Write(new Rule($"[yellow]{title}[/]").LeftAligned().RuleStyle("grey")); AnsiConsole.WriteLine(); - AnsiConsole.Render(canvas); + AnsiConsole.Write(canvas); } } } diff --git a/examples/Console/Charts/Program.cs b/examples/Console/Charts/Program.cs index f0c7664..c80a750 100644 --- a/examples/Console/Charts/Program.cs +++ b/examples/Console/Charts/Program.cs @@ -32,7 +32,7 @@ namespace Spectre.Console.Examples private static void Render(string title, IRenderable chart) { - AnsiConsole.Render( + AnsiConsole.Write( new Panel(chart) .Padding(1, 1) .Header(title)); diff --git a/examples/Console/Colors/Program.cs b/examples/Console/Colors/Program.cs index b73fc50..5ac6737 100644 --- a/examples/Console/Colors/Program.cs +++ b/examples/Console/Colors/Program.cs @@ -20,7 +20,7 @@ namespace Spectre.Console.Examples { AnsiConsole.ResetColors(); AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("[yellow bold underline]3-bit Colors[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Rule("[yellow bold underline]3-bit Colors[/]").RuleStyle("grey").LeftAligned()); AnsiConsole.WriteLine(); for (var i = 0; i < 8; i++) @@ -43,7 +43,7 @@ namespace Spectre.Console.Examples { AnsiConsole.ResetColors(); AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("[yellow bold underline]4-bit Colors[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Rule("[yellow bold underline]4-bit Colors[/]").RuleStyle("grey").LeftAligned()); AnsiConsole.WriteLine(); for (var i = 0; i < 16; i++) @@ -66,7 +66,7 @@ namespace Spectre.Console.Examples { AnsiConsole.ResetColors(); AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("[yellow bold underline]8-bit Colors[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Rule("[yellow bold underline]8-bit Colors[/]").RuleStyle("grey").LeftAligned()); AnsiConsole.WriteLine(); for (var i = 0; i < 16; i++) @@ -93,10 +93,10 @@ namespace Spectre.Console.Examples { AnsiConsole.ResetColors(); AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("[yellow bold underline]24-bit Colors[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Rule("[yellow bold underline]24-bit Colors[/]").RuleStyle("grey").LeftAligned()); AnsiConsole.WriteLine(); - AnsiConsole.Render(new ColorBox(width: 80, height: 15)); + AnsiConsole.Write(new ColorBox(width: 80, height: 15)); } } } diff --git a/examples/Console/Columns/Program.cs b/examples/Console/Columns/Program.cs index 9e20f15..83caa8a 100644 --- a/examples/Console/Columns/Program.cs +++ b/examples/Console/Columns/Program.cs @@ -16,7 +16,7 @@ namespace Spectre.Console.Examples } // Render all cards in columns - AnsiConsole.Render(new Columns(cards)); + AnsiConsole.Write(new Columns(cards)); } private static string GetCardContent(User user) diff --git a/examples/Console/Emojis/Program.cs b/examples/Console/Emojis/Program.cs index b91e296..8946f02 100644 --- a/examples/Console/Emojis/Program.cs +++ b/examples/Console/Emojis/Program.cs @@ -14,7 +14,7 @@ namespace Spectre.Console.Examples private static void RenderEmoji() { - AnsiConsole.Render( + AnsiConsole.Write( new Panel("[yellow]Hello :globe_showing_europe_africa:![/]") .RoundedBorder()); } diff --git a/examples/Console/Exceptions/Program.cs b/examples/Console/Exceptions/Program.cs index bb9a365..b05eafc 100644 --- a/examples/Console/Exceptions/Program.cs +++ b/examples/Console/Exceptions/Program.cs @@ -14,17 +14,17 @@ namespace Spectre.Console.Examples catch (Exception ex) { AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("Default").LeftAligned()); + AnsiConsole.Write(new Rule("Default").LeftAligned()); AnsiConsole.WriteLine(); AnsiConsole.WriteException(ex); AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("Compact").LeftAligned()); + AnsiConsole.Write(new Rule("Compact").LeftAligned()); AnsiConsole.WriteLine(); AnsiConsole.WriteException(ex, ExceptionFormats.ShortenEverything | ExceptionFormats.ShowLinks); AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("Compact + Custom colors").LeftAligned()); + AnsiConsole.Write(new Rule("Compact + Custom colors").LeftAligned()); AnsiConsole.WriteLine(); AnsiConsole.WriteException(ex, new ExceptionSettings { diff --git a/examples/Console/Figlet/Program.cs b/examples/Console/Figlet/Program.cs index 60f3760..1abc4e2 100644 --- a/examples/Console/Figlet/Program.cs +++ b/examples/Console/Figlet/Program.cs @@ -4,9 +4,9 @@ namespace Spectre.Console.Examples { public static void Main(string[] args) { - AnsiConsole.Render(new FigletText("Left aligned").LeftAligned().Color(Color.Red)); - AnsiConsole.Render(new FigletText("Centered").Centered().Color(Color.Green)); - AnsiConsole.Render(new FigletText("Right aligned").RightAligned().Color(Color.Blue)); + AnsiConsole.Write(new FigletText("Left aligned").LeftAligned().Color(Color.Red)); + AnsiConsole.Write(new FigletText("Centered").Centered().Color(Color.Green)); + AnsiConsole.Write(new FigletText("Right aligned").RightAligned().Color(Color.Blue)); } } } diff --git a/examples/Console/Grids/Program.cs b/examples/Console/Grids/Program.cs index 6320429..0f5c9f0 100644 --- a/examples/Console/Grids/Program.cs +++ b/examples/Console/Grids/Program.cs @@ -16,7 +16,7 @@ namespace Spectre.Console.Examples grid.AddRow(" [blue]-c[/], [blue]--configuration[/] ", "The configuration to run for."); grid.AddRow(" [blue]-v[/], [blue]--verbosity[/] ", "Set the [grey]MSBuild[/] verbosity level."); - AnsiConsole.Render(grid); + AnsiConsole.Write(grid); } } } diff --git a/examples/Console/Info/Program.cs b/examples/Console/Info/Program.cs index 304836a..6e8a7ac 100644 --- a/examples/Console/Info/Program.cs +++ b/examples/Console/Info/Program.cs @@ -19,7 +19,7 @@ namespace Spectre.Console.Examples .AddRow("[b]Buffer height[/]", $"{AnsiConsole.Console.Profile.Height}") .AddRow("[b]Encoding[/]", $"{AnsiConsole.Console.Profile.Encoding.EncodingName}"); - AnsiConsole.Render( + AnsiConsole.Write( new Panel(grid) .Header("Information")); } diff --git a/examples/Console/Panels/Program.cs b/examples/Console/Panels/Program.cs index 2c61b0b..fa4fd61 100644 --- a/examples/Console/Panels/Program.cs +++ b/examples/Console/Panels/Program.cs @@ -8,20 +8,20 @@ namespace Spectre.Console.Examples "[underline]I[/] heard [underline on blue]you[/] like panels\n\n\n\n" + "So I put a panel in a panel").Centered(); - AnsiConsole.Render( + AnsiConsole.Write( new Panel( new Panel(content) .Border(BoxBorder.Rounded))); // Left adjusted panel with text - AnsiConsole.Render( + AnsiConsole.Write( new Panel(new Text("Left adjusted\nLeft").LeftAligned()) .Expand() .SquareBorder() .Header("[red]Left[/]")); // Centered ASCII panel with text - AnsiConsole.Render( + AnsiConsole.Write( new Panel(new Text("Centered\nCenter").Centered()) .Expand() .AsciiBorder() @@ -29,7 +29,7 @@ namespace Spectre.Console.Examples .HeaderAlignment(Justify.Center)); // Right adjusted, rounded panel with text - AnsiConsole.Render( + AnsiConsole.Write( new Panel(new Text("Right adjusted\nRight").RightAligned()) .Expand() .RoundedBorder() diff --git a/examples/Console/Prompt/Program.cs b/examples/Console/Prompt/Program.cs index 00a81eb..0703998 100644 --- a/examples/Console/Prompt/Program.cs +++ b/examples/Console/Prompt/Program.cs @@ -28,8 +28,8 @@ namespace Spectre.Console.Examples // Summary AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("[yellow]Results[/]").RuleStyle("grey").LeftAligned()); - AnsiConsole.Render(new Table().AddColumns("[grey]Question[/]", "[grey]Answer[/]") + AnsiConsole.Write(new Rule("[yellow]Results[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Table().AddColumns("[grey]Question[/]", "[grey]Answer[/]") .RoundedBorder() .BorderColor(Color.Grey) .AddRow("[grey]Name[/]", name) @@ -43,7 +43,7 @@ namespace Spectre.Console.Examples private static string AskName() { AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("[yellow]Strings[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Rule("[yellow]Strings[/]").RuleStyle("grey").LeftAligned()); var name = AnsiConsole.Ask("What's your [green]name[/]?"); return name; } @@ -51,7 +51,7 @@ namespace Spectre.Console.Examples private static string AskFruit() { AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("[yellow]Lists[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Rule("[yellow]Lists[/]").RuleStyle("grey").LeftAligned()); var favorites = AnsiConsole.Prompt( new MultiSelectionPrompt() @@ -90,7 +90,7 @@ namespace Spectre.Console.Examples private static string AskSport() { AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("[yellow]Choices[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Rule("[yellow]Choices[/]").RuleStyle("grey").LeftAligned()); return AnsiConsole.Prompt( new TextPrompt("What's your [green]favorite sport[/]?") @@ -104,7 +104,7 @@ namespace Spectre.Console.Examples private static int AskAge() { AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("[yellow]Integers[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Rule("[yellow]Integers[/]").RuleStyle("grey").LeftAligned()); return AnsiConsole.Prompt( new TextPrompt("How [green]old[/] are you?") @@ -124,7 +124,7 @@ namespace Spectre.Console.Examples private static string AskPassword() { AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("[yellow]Secrets[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Rule("[yellow]Secrets[/]").RuleStyle("grey").LeftAligned()); return AnsiConsole.Prompt( new TextPrompt("Enter [green]password[/]?") @@ -135,7 +135,7 @@ namespace Spectre.Console.Examples private static string AskColor() { AnsiConsole.WriteLine(); - AnsiConsole.Render(new Rule("[yellow]Optional[/]").RuleStyle("grey").LeftAligned()); + AnsiConsole.Write(new Rule("[yellow]Optional[/]").RuleStyle("grey").LeftAligned()); return AnsiConsole.Prompt( new TextPrompt("[grey][[Optional]][/] What is your [green]favorite color[/]?") diff --git a/examples/Console/Rules/Program.cs b/examples/Console/Rules/Program.cs index 7b08fff..6f20666 100644 --- a/examples/Console/Rules/Program.cs +++ b/examples/Console/Rules/Program.cs @@ -34,7 +34,7 @@ namespace Spectre.Console.Examples private static void Render(Rule rule) { - AnsiConsole.Render(rule); + AnsiConsole.Write(rule); AnsiConsole.WriteLine(); } } diff --git a/examples/Console/Showcase/Program.cs b/examples/Console/Showcase/Program.cs index 9cfb2c3..e263f2f 100644 --- a/examples/Console/Showcase/Program.cs +++ b/examples/Console/Showcase/Program.cs @@ -83,7 +83,7 @@ namespace Spectre.Console.Examples // Render the table AnsiConsole.WriteLine(); - AnsiConsole.Render(table); + AnsiConsole.Write(table); } private static IRenderable GetColorTable() diff --git a/examples/Console/Tables/Program.cs b/examples/Console/Tables/Program.cs index 8919521..007b52d 100644 --- a/examples/Console/Tables/Program.cs +++ b/examples/Console/Tables/Program.cs @@ -4,7 +4,7 @@ namespace Spectre.Console.Examples { public static void Main() { - AnsiConsole.Render(CreateTable()); + AnsiConsole.Write(CreateTable()); } private static Table CreateTable() diff --git a/examples/Console/Trees/Program.cs b/examples/Console/Trees/Program.cs index dcc2ffa..8a75651 100644 --- a/examples/Console/Trees/Program.cs +++ b/examples/Console/Trees/Program.cs @@ -8,7 +8,7 @@ namespace Spectre.Console.Examples // Render the tree var tree = BuildTree(); - AnsiConsole.Render(tree); + AnsiConsole.Write(tree); } private static Tree BuildTree() diff --git a/src/Spectre.Console/AnsiConsole.Rendering.cs b/src/Spectre.Console/AnsiConsole.Rendering.cs index dd139a2..9423f56 100644 --- a/src/Spectre.Console/AnsiConsole.Rendering.cs +++ b/src/Spectre.Console/AnsiConsole.Rendering.cs @@ -12,7 +12,17 @@ namespace Spectre.Console /// Renders the specified object to the console. /// /// The object to render. + [Obsolete("Consider using AnsiConsole.Write instead.")] public static void Render(IRenderable renderable) + { + Write(renderable); + } + + /// + /// Renders the specified to the console. + /// + /// The object to render. + public static void Write(IRenderable renderable) { if (renderable is null) {