use helpers instead of TryGetValue

Author: StephaneDelcroix

src/Controls/src/SourceGen/AnalyzerConfigOptionsExtensions.cs

@@ -0,0 +1,25 @@
+using System;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.Maui.Controls.SourceGen;
+
+public static class AnalyzerConfigOptionsExtensions
+{
+	public static bool IsEnabled(this AnalyzerConfigOptions options, string key)
+		=> options.TryGetValue(key, out var value) && string.Compare(value, "enable", StringComparison.OrdinalIgnoreCase) == 0;
+
+	public static bool IsDisabled(this AnalyzerConfigOptions options, string key)
+		=> options.TryGetValue(key, out var value) && string.Compare(value, "disable", StringComparison.OrdinalIgnoreCase) == 0;
+
+	public static bool IsTrue(this AnalyzerConfigOptions options, string key)
+		=> options.TryGetValue(key, out var value) && string.Compare(value, "true", StringComparison.OrdinalIgnoreCase) == 0;
+
+	public static bool IsFalse(this AnalyzerConfigOptions options, string key)
+		=> options.TryGetValue(key, out var value) && string.Compare(value, "false", StringComparison.OrdinalIgnoreCase) == 0;
+
+	public static string GetValueOrDefault(this AnalyzerConfigOptions options, string key, string defaultValue)
+		=> options.TryGetValue(key, out var value) ? value : defaultValue;
+
+	public static string? GetValueOrNull(this AnalyzerConfigOptions options, string key)
+		=> options.TryGetValue(key, out var value) ? value : null;
+}

src/Controls/src/SourceGen/ProjectItem.cs

@@ -5,97 +5,66 @@
 using Microsoft.Maui.Controls.Xaml;
 
 namespace Microsoft.Maui.Controls.SourceGen;
-
 record ProjectItem(AdditionalText AdditionalText, AnalyzerConfigOptions Options)
 {
 	public string Configuration
-		=> Options.TryGetValue("build_metadata.additionalfiles.Configuration", out var configuration)
-				? configuration
-				: "Debug";
+		=> Options.GetValueOrDefault("build_metadata.additionalfiles.Configuration", "Debug");
 
 	public bool EnableLineInfo
 	{
 		get
 		{
-			var enableLineInfo = true;
-			if (Options.TryGetValue("build_property.MauiXamlLineInfo", out var lineInfo) && string.Compare(lineInfo, "disable", StringComparison.OrdinalIgnoreCase) == 0)
-				enableLineInfo = false;
-			if (Options.TryGetValue("build_metadata.additionalfiles.LineInfo", out lineInfo) && string.Compare(lineInfo, "enable", StringComparison.OrdinalIgnoreCase) == 0)
-				enableLineInfo = true;
-			if (Options.TryGetValue("build_metadata.additionalfiles.LineInfo", out lineInfo) && string.Compare(lineInfo, "disable", StringComparison.OrdinalIgnoreCase) == 0)
-				enableLineInfo = false;
-			return enableLineInfo;
+			if (Options.IsEnabled("build_metadata.additionalfiles.LineInfo"))
+				return true;
+			if (Options.IsDisabled("build_metadata.additionalfiles.LineInfo"))
+				return false;
+			return !Options.IsDisabled("build_property.MauiXamlLineInfo");
 		}
 	}
+
 	public bool EnableDiagnostics
 	{
 		get
 		{
-			bool enableDiagnostics = false;
-			if (Options.TryGetValue("build_property.EnableMauiXamlDiagnostics", out var enDiag) && string.Compare(enDiag, "true", StringComparison.OrdinalIgnoreCase) == 0)
-				enableDiagnostics = true;
-			if (Options.TryGetValue("build_metadata.additionalfiles.EnableDiagnostics", out enDiag) && string.Compare(enDiag, "true", StringComparison.OrdinalIgnoreCase) == 0)
-				enableDiagnostics = true;
-			if (Options.TryGetValue("build_metadata.additionalfiles.EnableDiagnostics", out enDiag) && string.Compare(enDiag, "false", StringComparison.OrdinalIgnoreCase) == 0)
-				enableDiagnostics = false;
-			return enableDiagnostics;
+			if (Options.IsTrue("build_metadata.additionalfiles.EnableDiagnostics"))
+				return true;
+			if (Options.IsFalse("build_metadata.additionalfiles.EnableDiagnostics"))
+				return false;
+			return Options.IsTrue("build_property.EnableMauiXamlDiagnostics");
 		}
 	}
 
 	public string Kind
-		=> Options.TryGetValue("build_metadata.additionalfiles.GenKind", out var kind)
-				? kind
-				: "None";
+		=> Options.GetValueOrDefault("build_metadata.additionalfiles.GenKind", "None");
 
 	public XamlInflator Inflator
 	{
 		get
 		{
-			var xamlinflator = 0;
-			if (Options.TryGetValue("build_metadata.additionalfiles.Inflator", out var inflator) && !string.IsNullOrEmpty(inflator))
+			var xamlinflator = 0;			
+			var parts = Options.GetValueOrDefault("build_metadata.additionalfiles.Inflator", "").Split(',');
+			for (int i = 0; i < parts.Length; i++)
 			{
-				var parts = inflator!.Split(',');
-				for (int i = 0; i < parts.Length; i++)
-				{
-					var trimmed = parts[i].Trim();
-					if (Enum.TryParse<XamlInflator>(trimmed, true, out var xinfl))
-						xamlinflator |= (int)xinfl;
-				}
+				var trimmed = parts[i].Trim();
+				if (Enum.TryParse<XamlInflator>(trimmed, true, out var xinfl))
+					xamlinflator |= (int)xinfl;
 			}
 			return (XamlInflator)xamlinflator;
 		}
 	}
 
 	public string? ManifestResourceName
-		=> Options.TryGetValue("build_metadata.additionalfiles.ManifestResourceName", out var manifestResourceName)
-				? manifestResourceName
-				: null;
+		=> Options.GetValueOrNull("build_metadata.additionalfiles.ManifestResourceName");
 
 	public string NoWarn
-	{
-		get
-		{
-			string noWarn = "";
-			if (Options.TryGetValue("build_property.MauiXamlNoWarn", out var noWarnValue))
-				noWarn = noWarnValue;
-			if (Options.TryGetValue("build_metadata.additionalfiles.NoWarn", out noWarnValue))
-				noWarn = noWarnValue;
-			return noWarn;
-		}
-	}
+		=> Options.GetValueOrNull("build_metadata.additionalfiles.NoWarn") ?? Options.GetValueOrNull("build_property.MauiXamlNoWarn") ?? "";
 
 	public string? RelativePath
-		=> Options.TryGetValue("build_metadata.additionalfiles.RelativePath", out var relativePath)
-				? relativePath
-				: null;
+		=> Options.GetValueOrNull("build_metadata.additionalfiles.RelativePath");
 
 	public string? TargetFramework
-		=> Options.TryGetValue("build_metadata.additionalfiles.targetFramework", out var targetFramework)
-				? targetFramework
-				: null;
+		=> Options.GetValueOrNull("build_metadata.additionalfiles.targetFramework");
 
 	public string? TargetPath
-		=> Options.TryGetValue("build_metadata.additionalfiles.TargetPath", out var targetPath) && !string.IsNullOrEmpty(targetPath)
-				? targetPath
-				: AdditionalText.Path;	
+		=> Options.GetValueOrDefault("build_metadata.additionalfiles.TargetPath", AdditionalText.Path);
 }