chore: c#markup generator

unoplatform · Oct 15, 2023 · 1b96490 · 1b96490
1 parent b4cad3f
commit 1b96490
Show file tree

Hide file tree

Showing 13 changed files with 829 additions and 24 deletions.
diff --git a/src/library/Uno.Themes.WinUI.Markup.Generator/Extensions/ColorExtensions.cs b/src/library/Uno.Themes.WinUI.Markup.Generator/Extensions/ColorExtensions.cs
@@ -6,7 +6,7 @@ namespace Uno.Markup.Extensions;
 public static class ColorExtensions
 {
 	public static string ToRgbText(this Color color) => $"{color.R:X2}{color.G:X2}{color.B:X2}";
-	public static string ToRgbText(this SolidColorBrush brush) => brush.Color.ToRgbText();
+	public static string? ToRgbText(this SolidColorBrush brush) => brush.Color?.ToRgbText();
 
 #if LINQPAD
 	public static object ToColoredBlock(this Color color)
@@ -21,5 +21,5 @@ public static string ToPrettyString(this Color color)
 	{
 		return $"#{color.A:X2}{color.R:X2}{color.G:X2}{color.B:X2} (rgb: {color.R} {color.G} {color.B}, alpha: {color.A})";
 	}
-	public static string ToPrettyString(this SolidColorBrush brush) => brush.Color.ToPrettyString();
+	public static string? ToPrettyString(this SolidColorBrush brush) => brush.Color?.ToPrettyString();
 }
diff --git a/src/library/Uno.Themes.WinUI.Markup.Generator/Extensions/FluentExtensions.cs b/src/library/Uno.Themes.WinUI.Markup.Generator/Extensions/FluentExtensions.cs
@@ -3,8 +3,8 @@
 public static class FluentExtensions
 {
 	public static T? As<T>(this object? x) where T : class => x as T;
-	public static TResult? Apply<T, TResult>(this T value, Func<T, TResult> selector)
+	public static TResult Apply<T, TResult>(this T value, Func<T, TResult> selector)
 	{
-		return value != null ? selector(value) : default;
+		return selector(value);
 	}
 }
diff --git a/src/library/Uno.Themes.WinUI.Markup.Generator/Extensions/StringExtensions.cs b/src/library/Uno.Themes.WinUI.Markup.Generator/Extensions/StringExtensions.cs
@@ -7,14 +7,14 @@ public static class StringExtensions
 	public static string Prefix(this string? value, string prefix) => prefix + value;
 	public static string Suffix(this string? value, string suffix) => value + suffix;
 	public static string RegexReplace(this string input, string pattern, string replacement) => Regex.Replace(input, pattern, replacement);
-	public static string RemoveOnce(this string s, string value)
+	public static string? RemoveOnce(this string s, string? value)
 	{
-		return value.Length > 0 && s.IndexOf(value) is var index && index != -1
+		return value?.Length > 0 && s.IndexOf(value) is var index && index != -1
 			? s.Remove(index, value.Length)
-			: value;
+			: s;
 	}
-	public static string RemoveHead(this string value, string head) => head?.Length > 0 && value.StartsWith(head) ? value[head.Length..] : value;
-	public static string RemoveTail(this string value, string tail) => tail?.Length > 0 && value.EndsWith(tail) ? value[..^tail.Length] : value;
+	public static string RemoveHead(this string value, string? head) => head?.Length > 0 && value.StartsWith(head) ? value[head.Length..] : value;
+	public static string RemoveTail(this string value, string? tail) => tail?.Length > 0 && value.EndsWith(tail) ? value[..^tail.Length] : value;
 	public static string Trim(this string value, string trimChars) => value.Trim(trimChars.ToArray());
 	public static string? StripPair(this string value, string pair) => TryStripPair(value, pair, out var result) ? result : value;
 	public static bool TryStripPair(this string value, string pair, out string? result)

diff --git a/src/library/Uno.Themes.WinUI.Markup.Generator/Uno.Themes.WinUI.Markup.Generator.csproj b/src/library/Uno.Themes.WinUI.Markup.Generator/Uno.Themes.WinUI.Markup.Generator.csproj
@@ -10,6 +10,7 @@
 
 	<PropertyGroup>
 		<RootNamespace>Uno.Markup</RootNamespace>
+		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<PropertyGroup>