Added support for value task to the field name tools

ChilliCream · Feb 23, 2020 · 46ba880 · 46ba880
1 parent 190b045
commit 46ba880
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/Core/Abstractions/AttributeExtensions.cs b/src/Core/Abstractions/AttributeExtensions.cs
@@ -86,7 +86,7 @@ private static string NormalizeMethodName(MethodInfo method)
                 name = name.Substring(_get.Length);
             }
 
-            if (typeof(Task).IsAssignableFrom(method.ReturnType)
+            if (IsAsyncMethod(method.ReturnType)
                 && name.Length > _async.Length
                 && name.EndsWith(_async, StringComparison.Ordinal))
             {
@@ -96,6 +96,24 @@ private static string NormalizeMethodName(MethodInfo method)
             return NormalizeName(name);
         }
 
+        private static bool IsAsyncMethod(Type returnType)
+        {
+            if (typeof(Task).IsAssignableFrom(returnType)
+                || typeof(ValueTask).IsAssignableFrom(returnType))
+            {
+                return true;
+            }
+
+            if (returnType.IsGenericType)
+            {
+                Type typeDefinition = returnType.GetGenericTypeDefinition();
+                return typeof(ValueTask<>) == typeDefinition
+                    || typeof(IAsyncEnumerable<>) == typeDefinition;
+            }
+
+            return false;
+        }
+
         public static string GetGraphQLDescription(
             this ICustomAttributeProvider attributeProvider)
         {