Fixed up Spectre usage. Closes GH-94

JasperFx · Sep 23, 2024 · 343144a · 343144a
1 parent 196ac6c
commit 343144a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/src/EnvironmentCheckDemonstrator/Describers.cs b/src/EnvironmentCheckDemonstrator/Describers.cs
@@ -28,7 +28,7 @@ public Task Write(TextWriter writer)
 
         public Task WriteToConsole()
         {
-            AnsiConsole.Write("[darkblue]Second part writing in blue[/]");
+            AnsiConsole.MarkupLine("[darkblue]Second part writing in blue[/]");
             return Task.CompletedTask;
         }
     }

diff --git a/src/MvcApp/Describers.cs b/src/MvcApp/Describers.cs
@@ -28,7 +28,7 @@ public Task Write(TextWriter writer)
 
         public Task WriteToConsole()
         {
-            AnsiConsole.Write("[darkblue]Second part writing in blue[/]");
+            AnsiConsole.MarkupLine("[darkblue]Second part writing in blue[/]");
             return Task.CompletedTask;
         }
     }

diff --git a/src/Oakton/CommandExecutor.cs b/src/Oakton/CommandExecutor.cs
@@ -41,14 +41,14 @@ private static async Task<int> execute(CommandRun run)
         }
         catch (CommandFailureException e)
         {
-            AnsiConsole.Write("[red]ERROR:[/]");
+            AnsiConsole.MarkupLine("[red]ERROR:[/]");
             AnsiConsole.WriteException(e);
 
             return 1;
         }
         catch (Exception ex)
         {
-            AnsiConsole.Write("[red]ERROR:[/]");
+            AnsiConsole.MarkupLine("[red]ERROR:[/]");
             AnsiConsole.WriteException(ex);
 
             return 1;

diff --git a/src/Oakton/CommandFactory.cs b/src/Oakton/CommandFactory.cs
@@ -220,18 +220,18 @@ private CommandRun buildRun(Queue<string> queue, string commandName)
         }
         catch (InvalidUsageException e)
         {
-            AnsiConsole.Write("[red]Invalid usage[/]");
+            AnsiConsole.MarkupLine("[red]Invalid usage[/]");
 
             if (e.Message.IsNotEmpty())
             {
-                AnsiConsole.Write($"[yellow]{e.Message.EscapeMarkup()}[/]");
+                AnsiConsole.MarkupLine($"[yellow]{e.Message.EscapeMarkup()}[/]");
             }
 
             Console.WriteLine();
         }
         catch (Exception e)
         {
-            AnsiConsole.Write("[red]Error parsing input[/]");
+            AnsiConsole.MarkupLine("[red]Error parsing input[/]");
             AnsiConsole.WriteException(e);
 
             Console.WriteLine();

diff --git a/src/Oakton/Commands/CheckEnvironmentCommand.cs b/src/Oakton/Commands/CheckEnvironmentCommand.cs
@@ -33,11 +33,11 @@ public override async Task<bool> Execute(CheckEnvironmentInput input)
 
         if (results.Failures.Any())
         {
-            AnsiConsole.Write("[red]Some environment checks failed![/]");
+            AnsiConsole.MarkupLine("[red]Some environment checks failed![/]");
             return false;
         }
 
-        AnsiConsole.Write("[green]All environment checks are good![/]");
+        AnsiConsole.MarkupLine("[green]All environment checks are good![/]");
         return true;
     }
 }
diff --git a/src/Tests/Descriptions/DescribeCommandTests.cs b/src/Tests/Descriptions/DescribeCommandTests.cs
@@ -144,7 +144,7 @@ public Task Write(TextWriter writer)
 
         public Task WriteToConsole()
         {
-            AnsiConsole.Write("[darkblue]Second part writing in blue[/]");
+            AnsiConsole.MarkupLine("[darkblue]Second part writing in blue[/]");
             return Task.CompletedTask;
         }
     }

diff --git a/src/quickstart/Program.cs b/src/quickstart/Program.cs
@@ -50,7 +50,7 @@ public override bool Execute(NameInput input)
                 text = input.TitleFlag + " " + text;
             }
 
-            AnsiConsole.Write($"[{input.Color}]{text}[/]");
+            AnsiConsole.MarkupLine($"[{input.Color}]{text}[/]");
 
             // Just telling the OS that the command
             // finished up okay
@@ -100,10 +100,10 @@ public class DoNameThingsCommand : OaktonAsyncCommand<NameInput>
     {
         public override async Task<bool> Execute(NameInput input)
         {
-            AnsiConsole.Write($"[{input.Color}]Starting...[/]");
+            AnsiConsole.MarkupLine($"[{input.Color}]Starting...[/]");
             await Task.Delay(TimeSpan.FromSeconds(3));
 
-            AnsiConsole.Write($"[{input.Color}]Done! Hello {input.Name}[/]");
+            AnsiConsole.MarkupLine($"[{input.Color}]Done! Hello {input.Name}[/]");
             return true;
         }
     }