Merge pull request #7 from Shane32/patch-1

Update NullabilityInfoContext.cs.pp with bug fix from MS repo
SimonCropp · Jan 19, 2022 · 81f64db · 81f64db
2 parents c2a216d + 564e837
commit 81f64db
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/src/NullabilityInfo/NullabilityInfoContext.cs.pp b/src/NullabilityInfo/NullabilityInfoContext.cs.pp
@@ -342,10 +342,13 @@
             return NotAnnotatedStatus.None;
         }
 
-        private NullabilityInfo GetNullabilityInfo(MemberInfo memberInfo, Type type, IList<CustomAttributeData> customAttributes) =>
-            GetNullabilityInfo(memberInfo, type, customAttributes, 0);
+        private NullabilityInfo GetNullabilityInfo(MemberInfo memberInfo, Type type, IList<CustomAttributeData> customAttributes)
+        {
+            int index = 0;
+            return GetNullabilityInfo(memberInfo, type, customAttributes, ref index);
+        }
 
-        private NullabilityInfo GetNullabilityInfo(MemberInfo memberInfo, Type type, IList<CustomAttributeData> customAttributes, int index)
+        private NullabilityInfo GetNullabilityInfo(MemberInfo memberInfo, Type type, IList<CustomAttributeData> customAttributes, ref int index)
         {
             NullabilityState state = NullabilityState.Unknown;
             NullabilityInfo? elementState = null;
@@ -365,17 +368,22 @@
                     underlyingType = type;
                     state = NullabilityState.NotNull;
                 }
+
+                if (underlyingType.IsGenericType)
+                {
+                    index++;
+                }
             }
             else
             {
-                if (!ParseNullableState(customAttributes, index, ref state))
+                if (!ParseNullableState(customAttributes, index++, ref state))
                 {
                     state = GetNullableContext(memberInfo);
                 }
 
                 if (type.IsArray)
                 {
-                    elementState = GetNullabilityInfo(memberInfo, type.GetElementType()!, customAttributes, index + 1);
+                    elementState = GetNullabilityInfo(memberInfo, type.GetElementType()!, customAttributes, ref index);
                 }
             }
 
@@ -384,16 +392,9 @@
                 Type[] genericArguments = underlyingType.GetGenericArguments();
                 genericArgumentsState = new NullabilityInfo[genericArguments.Length];
 
-                for (int i = 0, offset = 0; i < genericArguments.Length; i++)
+                for (int i = 0; i < genericArguments.Length; i++)
                 {
-                    Type t = Nullable.GetUnderlyingType(genericArguments[i]) ?? genericArguments[i];
-
-                    if (!t.IsValueType || t.IsGenericType)
-                    {
-                        offset++;
-                    }
-
-                    genericArgumentsState[i] = GetNullabilityInfo(memberInfo, genericArguments[i], customAttributes, index + offset);
+                    genericArgumentsState[i] = GetNullabilityInfo(memberInfo, genericArguments[i], customAttributes, ref index);
                 }
             }
 
@@ -501,7 +502,8 @@
                     {
                         if (genericArguments[i].IsGenericParameter)
                         {
-                            NullabilityInfo n = GetNullabilityInfo(metaMember, genericArguments[i], genericArguments[i].GetCustomAttributesData(), i + 1);
+                            int index = i + 1;
+                            NullabilityInfo n = GetNullabilityInfo(metaMember, genericArguments[i], genericArguments[i].GetCustomAttributesData(), ref index);
                             nullability.GenericTypeArguments[i].ReadState = n.ReadState;
                             nullability.GenericTypeArguments[i].WriteState = n.WriteState;
                         }
@@ -524,7 +526,8 @@
                 && metaType.GetElementType()!.IsGenericParameter)
             {
                 Type elementType = metaType.GetElementType()!;
-                NullabilityInfo n = GetNullabilityInfo(metaMember, elementType, elementType.GetCustomAttributesData(), 0);
+                int index = 0;
+                NullabilityInfo n = GetNullabilityInfo(metaMember, elementType, elementType.GetCustomAttributesData(), ref index);
                 elementState.ReadState = n.ReadState;
                 elementState.WriteState = n.WriteState;
             }