Fixed issue with multi-line documentation. (#3529)

ChilliCream · Apr 19, 2021 · b1a484d · b1a484d
1 parent f9aeac0
commit b1a484d
Show file tree

Hide file tree

Showing 4 changed files with 531 additions and 4 deletions.
diff --git a/...ryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/JsonResultBuilderGenerator.cs b/...ryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/JsonResultBuilderGenerator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using StrawberryShake.CodeGeneration.CSharp.Builders;
 using StrawberryShake.CodeGeneration.CSharp.Extensions;
 using StrawberryShake.CodeGeneration.Descriptors;
@@ -366,10 +367,10 @@ private TryCatchBuilder CreateBuildDataSerialization()
             string exception = "ex")
         {
             string dict = TypeNames.Dictionary.WithGeneric(
-                TypeNames.String, 
+                TypeNames.String,
                 TypeNames.Object.MakeNullable());
-            
-            string body = "response.Body?.ToString()";
+
+            string body = "response.Body?.RootElement.ToString()";
 
             MethodCallBuilder createClientError =
                 MethodCallBuilder

diff --git a/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/SyntaxExtensions.cs b/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/SyntaxExtensions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -85,7 +86,20 @@ public static class SyntaxExtensions
         {
             if (value is { Length: > 0 })
             {
-                return member.AddSimple(XmlSummaryElement(XmlText(value)));
+                using var reader = new StringReader(value);
+                var list = new List<XmlNodeSyntax>();
+                string? line;
+
+                do
+                {
+                    line = reader.ReadLine();
+                    if(line is not null);
+                    {
+                        list.Add(XmlText(line));
+                    }
+                } while (line is not null);
+
+                return member.AddSimple(XmlSummaryElement(list.ToArray()));
             }
 
             return member;

diff --git a/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/SchemaGeneratorTests.cs b/src/StrawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/SchemaGeneratorTests.cs
@@ -415,5 +415,21 @@ enum Amenity {
                 }",
                 "extend schema @key(fields: \"id\")");
         }
+
+        [Fact]
+        public void MultiLineDocumentation()
+        {
+            AssertResult(
+                @"query Foo {
+                    abc
+                }",
+                @"type Query {
+                    """"""
+                    ABC
+                    DEF
+                    """"""
+                    abc: String
+                }");
+        }
     }
 }