Merge branch 'master' into doc-comments-escape-xml-characters

Author: grokys

Octokit.GraphQL.Core.Generation.UnitTests/InputObjectGenerationTests.cs

@@ -66,6 +66,31 @@ public void Generates_Property_For_List_Field()
             CompareModel("InputObject.cs", expected, result);
         }
 
+        [Fact]
+        public void Generates_Property_For_List_Field_With_Description()
+        {
+            var expected = FormatMemberTemplate("/// <summary>\r\n        /// Field foo for InputObject\r\n        /// </summary>\r\n        public IEnumerable<int?> Foo { get; set; }");
+
+            var model = new TypeModel
+            {
+                Name = "InputObject",
+                Kind = TypeKind.InputObject,
+                InputFields = new[]
+                {
+                    new InputValueModel
+                    {
+                        Description = "Field foo for InputObject",
+                        Name = "foo",
+                        Type = TypeModel.List(TypeModel.Int())
+                    },
+                }
+            };
+
+            var result = CodeGenerator.Generate(model, "Test", null);
+
+            CompareModel("InputObject.cs", expected, result);
+        }
+
         private string FormatMemberTemplate(string members)
         {
             if (members != null)

Octokit.GraphQL.Core.Generation/InputObjectGenerator.cs

@@ -52,9 +52,10 @@ private static string GenerateFields(TypeModel type)
 
         private static string GenerateField(InputValueModel field)
         {
+            var result = GenerateDocComments(field);
             var name = TypeUtilities.PascalCase(field.Name);
             var typeName = TypeUtilities.GetCSharpArgType(field.Type);
-            return $"        public {typeName} {name} {{ get; set; }}";
+            return result + $"        public {typeName} {name} {{ get; set; }}";
         }
 
         private static string GenerateDocComments(TypeModel type)
@@ -72,24 +73,12 @@ private static string GenerateDocComments(TypeModel type)
             }
         }
 
-        private static string GenerateDocComments(FieldModel field)
+        private static string GenerateDocComments(InputValueModel field)
         {
             if (!string.IsNullOrWhiteSpace(field.Description))
             {
                 var builder = new StringBuilder();
                 DocCommentGenerator.GenerateSummary(field.Description, 8, builder);
-
-                if (field.Args != null)
-                {
-                    foreach (var arg in field.Args)
-                    {
-                        if (!string.IsNullOrWhiteSpace(arg.Description))
-                        {
-                            builder.AppendLine($"        /// <param name=\"{arg.Name}\">{arg.Description}</param>");
-                        }
-                    }
-                }
-
                 return builder.ToString();
             }
             else

Octokit.GraphQL.Core.UnitTests/ExpressionRewriterAssertions.cs

@@ -52,7 +52,7 @@ public static string ReplaceSubqueryPlaceholders(string expectedString, params s
         {
             foreach (var subqueryPlaceholderReplacement in subqueryPlaceholderReplacements)
             {
-                var regex = new Regex("PagingTests.subqueryPlaceholder");
+                var regex = new Regex("SubqueryPlaceholder.placeholder");
                 expectedString = regex.Replace(expectedString, subqueryPlaceholderReplacement, 1);
             }