From 96bda931196bab8368969d0a1e1151a9427d618d Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Sat, 21 Jan 2023 11:43:14 +0100
Subject: [PATCH] fix: DevGenerator Nullable

---
 .../DevGenerators/CompositionGenerator/Generator.ListProxy.cs | 2 +-
 src/tools/DevGenerators/CompositionGenerator/Generator.cs     | 4 ++--
 src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs      | 2 +-
 src/tools/DevGenerators/GetProcAddressInitialization.cs       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs
index 135ab0426e..c293a9101d 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs
@@ -112,7 +112,7 @@ class Template
 
             var defs = cl.Members.OfType<MethodDeclarationSyntax>().First(m => m.Identifier.Text == "InitializeDefaults");
 
-            cl = cl.ReplaceNode(defs.Body, defs.Body.AddStatements(
+            cl = cl.ReplaceNode(defs.Body!, defs.Body!.AddStatements(
 
                 ParseStatement($"_list = new ServerListProxyHelper<{itemType}, {serverItemType}>(this);")));
           
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
index 3b5d3d8c3f..dfc8b45579 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
@@ -297,8 +297,8 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
                         server = server.WithBaseList(
                             server.BaseList?.AddTypes(SimpleBaseType(ParseTypeName(impl.ServerName))));
 
-                    client = client.AddMembers(
-                        ParseMemberDeclaration($"{impl.ServerName} {impl.Name}.Server => Server;"));
+                    if(ParseMemberDeclaration($"{impl.ServerName} {impl.Name}.Server => Server;") is { } member)
+                        client = client.AddMembers(member);
                 }
 
 
diff --git a/src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs b/src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs
index 86dbb3a452..c975bb8444 100644
--- a/src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs
+++ b/src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs
@@ -32,7 +32,7 @@ public class EnumMemberDictionaryGenerator : IIncrementalGenerator
             ).Collect();
         context.RegisterSourceOutput(all, static (context, methods) =>
         {
-            foreach (var typeGroup in methods.GroupBy(f => f.ContainingType, SymbolEqualityComparer.Default))
+            foreach (var typeGroup in methods.GroupBy<IMethodSymbol,ISymbol>(f => f.ContainingType, SymbolEqualityComparer.Default))
             {
                 var classBuilder = new StringBuilder();
                 if (typeGroup.Key.ContainingNamespace != null)
diff --git a/src/tools/DevGenerators/GetProcAddressInitialization.cs b/src/tools/DevGenerators/GetProcAddressInitialization.cs
index aedc13e7f6..e8d7c251fa 100644
--- a/src/tools/DevGenerators/GetProcAddressInitialization.cs
+++ b/src/tools/DevGenerators/GetProcAddressInitialization.cs
@@ -34,7 +34,7 @@ public class GetProcAddressInitializationGenerator : IIncrementalGenerator
         var all = fieldsWithAttribute.Collect();
         context.RegisterSourceOutput(all, static (context, methods) =>
         {
-            foreach (var typeGroup in methods.GroupBy(f => f.ContainingType, SymbolEqualityComparer.Default))
+            foreach (var typeGroup in methods.GroupBy<IMethodSymbol,ISymbol>(f => f.ContainingType, SymbolEqualityComparer.Default))
             {
                 var nextContext = 0;
                 var contexts = new Dictionary<string, int>();