Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static string GetValueOrDefault(this AnalyzerConfigOptions options, strin

public static T GetValueOrDefault<T>(this AnalyzerConfigOptions options, string key, T defaultValue, Func<string, T> parse)
=> options.TryGetValue(key, out var value) ? parse(value) : defaultValue;

public static string? GetValueOrNull(this AnalyzerConfigOptions options, string key)
=> options.TryGetValue(key, out var value) ? value : null;
}
6 changes: 6 additions & 0 deletions src/Controls/src/SourceGen/AnalyzerReleases.Unshipped.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,9 @@ MAUIX2003 | XamlInflation | Error | Descriptors
MAUIX2004 | XamlInflation | Error | Descriptors
MAUIX2005 | XamlInflation | Warning | Descriptors
MAUIX2006 | XamlParsing | Warning | PropertyElementWithAttribute
MAUIG2024 | XamlInflation | Warning | BindingWithXDataTypeFromOuterScope
MAUIG2041 | XamlInflation | Error | BindingIndexerNotClosed
MAUIG2042 | XamlInflation | Error | BindingIndexerEmpty
MAUIG2043 | XamlInflation | Error | BindingIndexerTypeUnsupported
MAUIG2045 | XamlInflation | Warning | BindingPropertyNotFound
MAUIG2064 | XamlInflation | Error | NamescopeDuplicate
7 changes: 4 additions & 3 deletions src/Controls/src/SourceGen/CodeBehindCodeWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public static string GenerateXamlCodeBehind(XamlProjectItemForCB? xamlItem, Comp

var generateInflatorSwitch = compilation.AssemblyName == "Microsoft.Maui.Controls.Xaml.UnitTests" && !generateDefaultCtor;
var xamlInflators = projItem.Inflator;

//if there's only the XamlC inflator, prevent non-assigned errors
if (xamlInflators == XamlInflator.XamlC)
sb.AppendLine("#pragma warning disable CS0649");
Expand Down Expand Up @@ -174,7 +174,8 @@ public static string GenerateXamlCodeBehind(XamlProjectItemForCB? xamlItem, Comp
InitComp("InitializeComponent");
else if ((xamlInflators & XamlInflator.XamlC) == XamlInflator.XamlC)
InitComp("InitializeComponent");
else if ((xamlInflators & XamlInflator.SourceGen) == XamlInflator.SourceGen) {
else if ((xamlInflators & XamlInflator.SourceGen) == XamlInflator.SourceGen)
{
InitComp("InitializeComponent", partialsignature: true);
//generate InitCompRuntime for HotReload fallback
if (projItem.EnableDiagnostics)
Expand All @@ -199,7 +200,7 @@ void InitComp(string methodName, bool empty = false, bool partialsignature = fal
if (namedFields != null && namedFields.Any())
{
sb.AppendLine($"#if NET5_0_OR_GREATER");
foreach ((var fname, _, _) in namedFields)
foreach ((var fname, _, _) in namedFields)
sb.AppendLine($"\t\t[global::System.Diagnostics.CodeAnalysis.MemberNotNullAttribute(nameof({EscapeIdentifier(fname)}))]");

sb.AppendLine($"#endif");
Expand Down
15 changes: 10 additions & 5 deletions src/Controls/src/SourceGen/CompilationReferencesComparer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,21 +90,26 @@ private static void AppendType(StringBuilder sb, INamedTypeSymbol type)
{
case IFieldSymbol f:
sb.Append(f.DeclaredAccessibility).Append(' ');
if (f.IsStatic) sb.Append("static ");
if (f.IsStatic)
sb.Append("static ");
sb.Append(f.Type.ToFQDisplayString()).Append(' ').Append(f.Name).Append(';');
break;

case IPropertySymbol p:
sb.Append(p.DeclaredAccessibility).Append(' ');
if (p.IsStatic) sb.Append("static ");
if (p.IsStatic)
sb.Append("static ");
sb.Append(p.Type.ToFQDisplayString()).Append(' ').Append(p.Name);
if (p.GetMethod != null) sb.Append("{get;}");
if (p.SetMethod != null) sb.Append("{set;}");
if (p.GetMethod != null)
sb.Append("{get;}");
if (p.SetMethod != null)
sb.Append("{set;}");
break;

case IMethodSymbol m when m.MethodKind == MethodKind.Ordinary:
sb.Append(m.DeclaredAccessibility).Append(' ');
if (m.IsStatic) sb.Append("static ");
if (m.IsStatic)
sb.Append("static ");
sb.Append(m.ReturnType.ToFQDisplayString()).Append(' ').Append(m.Name);
sb.Append('(');
sb.Append(string.Join(",", m.Parameters.Select(p => p.Type.ToFQDisplayString())));
Expand Down
Loading
Loading