Fix regression in markup output

xoofx · xoofx · commit 9ab1522c032c · 2024-11-18T18:28:44.000+01:00
diff --git a/src/Ultra/Program.cs b/src/Ultra/Program.cs
@@ -68,26 +68,26 @@ await AnsiConsole.Status()
                                 
                                 options.LogStepProgress = (text) =>
                                 {
-                                    if (verbose && previousText != text)
+                                    if (verbose && previousText is not null && previousText != text)
                                     {
-                                        AnsiConsole.MarkupLine($"{previousText} [green]\u2713[/]");
+                                        AnsiConsole.MarkupLine($"{Markup.Escape(previousText)} [green]\u2713[/]");
                                         previousText = text;
                                     }
 
-                                    statusCtx.Status($"{text}");
+                                    statusCtx.Status(Markup.Escape(text));
                                 };
                                 options.LogProgress = (text) =>
                                 {
                                     if (verbose && previousText != null && previousText != text)
                                     {
-                                        AnsiConsole.MarkupLine($"{previousText} [green]\u2713[/]");
+                                        AnsiConsole.MarkupLine($"{Markup.Escape(previousText)} [green]\u2713[/]");
                                     }
 
-                                    statusCtx.Status(text);
+                                    statusCtx.Status(Markup.Escape(text));
                                     previousText = text;
                                 };
-                                options.WaitingFileToComplete = (file) => { statusCtx.Status($"Waiting for {file} to complete"); };
-                                options.WaitingFileToCompleteTimeOut = (file) => { statusCtx.Status($"Timeout waiting for {file} to complete"); };
+                                options.WaitingFileToComplete = (file) => { statusCtx.Status($"Waiting for {Markup.Escape(file)} to complete"); };
+                                options.WaitingFileToCompleteTimeOut = (file) => { statusCtx.Status($"Timeout waiting for {Markup.Escape(file)} to complete"); };
 
                                 // Add the pid passed as options
                                 options.ProcessIds.AddRange(pidList);
@@ -175,23 +175,23 @@ await AnsiConsole.Status()
 
                                 options.LogStepProgress = (text) =>
                                 {
-                                    if (verbose && previousText != text)
+                                    if (verbose && previousText is not null && previousText != text)
                                     {
-                                        AnsiConsole.MarkupLine($"{previousText} [green]\u2713[/]");
+                                        AnsiConsole.MarkupLine($"{Markup.Escape(previousText)} [green]\u2713[/]");
                                         previousText = text;
                                     }
 
-                                    statusCtx.Status($"{text}");
+                                    statusCtx.Status(Markup.Escape(text));
                                 };
 
                                 options.LogProgress = (text) =>
                                 {
                                     if (verbose && previousText != null && previousText != text)
                                     {
-                                        AnsiConsole.MarkupLine($"{previousText} [green]\u2713[/]");
+                                        AnsiConsole.MarkupLine($"{Markup.Escape(previousText)} [green]\u2713[/]");
                                     }
 
-                                    statusCtx.Status(text);
+                                    statusCtx.Status(Markup.Escape(text));
                                     previousText = text;
                                 };
 

Original file line number	Diff line number	Diff line change
`@@ -68,26 +68,26 @@ await AnsiConsole.Status()`
`68`	`68`
`69`	`69`	`options.LogStepProgress = (text) =>`
`70`	`70`	`{`
`71`		`- if (verbose && previousText != text)`
	`71`	`+ if (verbose && previousText is not null && previousText != text)`
`72`	`72`	`{`
`73`		`- AnsiConsole.MarkupLine($"{previousText} [green]\u2713[/]");`
	`73`	`+ AnsiConsole.MarkupLine($"{Markup.Escape(previousText)} [green]\u2713[/]");`
`74`	`74`	`previousText = text;`
`75`	`75`	`}`
`76`	`76`
`77`		`- statusCtx.Status($"{text}");`
	`77`	`+ statusCtx.Status(Markup.Escape(text));`
`78`	`78`	`};`
`79`	`79`	`options.LogProgress = (text) =>`
`80`	`80`	`{`
`81`	`81`	`if (verbose && previousText != null && previousText != text)`
`82`	`82`	`{`
`83`		`- AnsiConsole.MarkupLine($"{previousText} [green]\u2713[/]");`
	`83`	`+ AnsiConsole.MarkupLine($"{Markup.Escape(previousText)} [green]\u2713[/]");`
`84`	`84`	`}`
`85`	`85`
`86`		`- statusCtx.Status(text);`
	`86`	`+ statusCtx.Status(Markup.Escape(text));`
`87`	`87`	`previousText = text;`
`88`	`88`	`};`
`89`		`- options.WaitingFileToComplete = (file) => { statusCtx.Status($"Waiting for {file} to complete"); };`
`90`		`- options.WaitingFileToCompleteTimeOut = (file) => { statusCtx.Status($"Timeout waiting for {file} to complete"); };`
	`89`	`+ options.WaitingFileToComplete = (file) => { statusCtx.Status($"Waiting for {Markup.Escape(file)} to complete"); };`
	`90`	`+ options.WaitingFileToCompleteTimeOut = (file) => { statusCtx.Status($"Timeout waiting for {Markup.Escape(file)} to complete"); };`
`91`	`91`
`92`	`92`	`// Add the pid passed as options`
`93`	`93`	`options.ProcessIds.AddRange(pidList);`
`@@ -175,23 +175,23 @@ await AnsiConsole.Status()`
`175`	`175`
`176`	`176`	`options.LogStepProgress = (text) =>`
`177`	`177`	`{`
`178`		`- if (verbose && previousText != text)`
	`178`	`+ if (verbose && previousText is not null && previousText != text)`
`179`	`179`	`{`
`180`		`- AnsiConsole.MarkupLine($"{previousText} [green]\u2713[/]");`
	`180`	`+ AnsiConsole.MarkupLine($"{Markup.Escape(previousText)} [green]\u2713[/]");`
`181`	`181`	`previousText = text;`
`182`	`182`	`}`
`183`	`183`
`184`		`- statusCtx.Status($"{text}");`
	`184`	`+ statusCtx.Status(Markup.Escape(text));`
`185`	`185`	`};`
`186`	`186`
`187`	`187`	`options.LogProgress = (text) =>`
`188`	`188`	`{`
`189`	`189`	`if (verbose && previousText != null && previousText != text)`
`190`	`190`	`{`
`191`		`- AnsiConsole.MarkupLine($"{previousText} [green]\u2713[/]");`
	`191`	`+ AnsiConsole.MarkupLine($"{Markup.Escape(previousText)} [green]\u2713[/]");`
`192`	`192`	`}`
`193`	`193`
`194`		`- statusCtx.Status(text);`
	`194`	`+ statusCtx.Status(Markup.Escape(text));`
`195`	`195`	`previousText = text;`
`196`	`196`	`};`
`197`	`197`