diff --git a/src/Spectre.Console/Extensions/AnsiConsoleExtensions.Rendering.cs b/src/Spectre.Console/Extensions/AnsiConsoleExtensions.Rendering.cs index 1d2f35a..ed281a6 100644 --- a/src/Spectre.Console/Extensions/AnsiConsoleExtensions.Rendering.cs +++ b/src/Spectre.Console/Extensions/AnsiConsoleExtensions.Rendering.cs @@ -34,11 +34,6 @@ namespace Spectre.Console private static void Render(IAnsiConsole console, RenderContext options, IEnumerable renderables) { - if (renderables is null) - { - return; - } - var result = new List(); foreach (var renderable in renderables) { diff --git a/src/Spectre.Console/Extensions/StringExtensions.cs b/src/Spectre.Console/Extensions/StringExtensions.cs index 7d5a02f..7731805 100644 --- a/src/Spectre.Console/Extensions/StringExtensions.cs +++ b/src/Spectre.Console/Extensions/StringExtensions.cs @@ -23,7 +23,7 @@ namespace Spectre.Console /// /// The text to escape. /// A string that is safe to use in markup. - public static string EscapeMarkup(this string text) + public static string EscapeMarkup(this string? text) { if (text == null) { @@ -45,7 +45,7 @@ namespace Spectre.Console return Cell.GetCellLength(context, text); } - internal static string Capitalize(this string text, CultureInfo? culture = null) + internal static string Capitalize(this string? text, CultureInfo? culture = null) { if (text == null) { diff --git a/src/Spectre.Console/Extensions/StyleExtensions.cs b/src/Spectre.Console/Extensions/StyleExtensions.cs index b61ffca..01dd5d3 100644 --- a/src/Spectre.Console/Extensions/StyleExtensions.cs +++ b/src/Spectre.Console/Extensions/StyleExtensions.cs @@ -96,11 +96,6 @@ namespace Spectre.Console throw new ArgumentNullException(nameof(style)); } - if (source is null) - { - return style; - } - var current = style; foreach (var item in source) { diff --git a/src/Spectre.Console/Internal/Ratio.cs b/src/Spectre.Console/Internal/Ratio.cs index 79fa787..950a9ca 100644 --- a/src/Spectre.Console/Internal/Ratio.cs +++ b/src/Spectre.Console/Internal/Ratio.cs @@ -53,10 +53,7 @@ namespace Spectre.Console.Internal var totalRemaining = total; var distributedTotal = new List(); - if (minimums == null) - { - minimums = ratios.Select(_ => 0).ToList(); - } + minimums ??= ratios.Select(_ => 0).ToList(); foreach (var (ratio, minimum) in ratios.Zip(minimums, (a, b) => (a, b))) { diff --git a/src/Spectre.Console/Internal/Text/StyleParser.cs b/src/Spectre.Console/Internal/Text/StyleParser.cs index e446679..aaf234c 100644 --- a/src/Spectre.Console/Internal/Text/StyleParser.cs +++ b/src/Spectre.Console/Internal/Text/StyleParser.cs @@ -72,10 +72,7 @@ namespace Spectre.Console.Internal var decoration = DecorationTable.GetDecoration(part); if (decoration != null) { - if (effectiveDecoration == null) - { - effectiveDecoration = Decoration.None; - } + effectiveDecoration ??= Decoration.None; effectiveDecoration |= decoration.Value; } diff --git a/src/Spectre.Console/Rendering/Segment.cs b/src/Spectre.Console/Rendering/Segment.cs index 1b0fe0b..c80cb0f 100644 --- a/src/Spectre.Console/Rendering/Segment.cs +++ b/src/Spectre.Console/Rendering/Segment.cs @@ -469,7 +469,7 @@ namespace Spectre.Console.Rendering /// The segment to truncate. /// The maximum width that the segment may occupy. /// A new truncated segment, or null. - public static Segment? Truncate(RenderContext context, Segment segment, int maxWidth) + public static Segment? Truncate(RenderContext context, Segment? segment, int maxWidth) { if (context is null) { diff --git a/src/Spectre.Console/Widgets/Progress/ProgressTask.cs b/src/Spectre.Console/Widgets/Progress/ProgressTask.cs index d847619..1aec5ec 100644 --- a/src/Spectre.Console/Widgets/Progress/ProgressTask.cs +++ b/src/Spectre.Console/Widgets/Progress/ProgressTask.cs @@ -127,10 +127,7 @@ namespace Spectre.Console lock (_lock) { var now = DateTime.Now; - if (StartTime == null) - { - StartTime = now; - } + StartTime ??= now; StopTime = now; }