Handling enums and nullable attributes that do not exist in netcoreapp31

ladeak · Mar 1, 2021 · 4536914 · 4536914
1 parent fea4149
commit 4536914
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/JsonMergePatch.SourceGenerator/GeneratedTypeFilter.cs b/src/JsonMergePatch.SourceGenerator/GeneratedTypeFilter.cs
@@ -12,8 +12,7 @@ public static bool IsGeneratableType(ITypeSymbol typeInfo)
             bool generic = false;
             if (typeInfo is INamedTypeSymbol namedTypeInfo)
                 generic = namedTypeInfo.IsGenericType;
-            return typeInfo.SpecialType == SpecialType.None && !typeInfo.IsAnonymousType && !typeInfo.IsAbstract && !generic;
-            //&& typeInfo.GetMembers().OfType<IMethodSymbol>().Where(x => x.MethodKind == MethodKind.Constructor).AnyOrNull(x => x.Parameters.IsEmpty);
+            return typeInfo.SpecialType == SpecialType.None && !typeInfo.IsAnonymousType && !typeInfo.IsAbstract && !generic && !typeInfo.IsStatic && typeInfo.TypeKind != TypeKind.Enum;
         }
 
 

diff --git a/src/JsonMergePatch.SourceGenerator/TypeBuilder.cs b/src/JsonMergePatch.SourceGenerator/TypeBuilder.cs
@@ -150,7 +150,9 @@ private string ConvertToNullableIfRequired(PropertyInformation propertyInfo, ITy
         private void BuildAttributes(BuilderState state, IEnumerable<AttributeData> attributes)
         {
             foreach (var attribute in attributes)
-                BuildAttribute(state, attribute);
+                if (attribute.AttributeClass?.ToDisplayString() != "System.Runtime.CompilerServices.NullableContextAttribute" &&
+                    attribute.AttributeClass?.ToDisplayString() != "System.Runtime.CompilerServices.NullableAttribute")
+                    BuildAttribute(state, attribute);
         }
 
         private void BuildAttribute(BuilderState state, AttributeData attribute) => state.AppendLine($"[{attribute}]");
@@ -209,7 +211,6 @@ private void SetInitOnlyProperties(BuilderState state)
         {
             if (!state.TypeInfo.Properties.Any(x => IsInitOnlyProperty(x.Property)))
                 return;
-            //state.AppendLine($"var tmp = new {state.TypeInfo.SourceTypeName}()");
             CallConstructIfEmpty(state, "var tmp =", leaveOpen: true);
             state.AppendLine("{");
             var initializerState = state.IncrementIdentation();