Simplified the Syntax Printer (#1575)

ChilliCream · Mar 23, 2020 · bacd442 · bacd442
1 parent 17555f2
commit bacd442
Show file tree

Hide file tree

Showing 167 changed files with 2,579 additions and 87 deletions.
diff --git a/src/HotChocolate/Core/src/Core/Validation/ValuesOfCorrectTypeVisitor.cs b/src/HotChocolate/Core/src/Core/Validation/ValuesOfCorrectTypeVisitor.cs
@@ -137,7 +137,7 @@ public ValuesOfCorrectTypeVisitor(ISchema schema)
                     "The specified argument value " +
                     "does not match the argument type.\n" +
                     $"Argument: `{argument.Name.Value}`\n" +
-                    $"Value: `{argument.Value}`",
+                    $"Value: `{argument.Value.Value}`",
                     argument));
             }
         }

diff --git a/src/HotChocolate/Core/src/Types/Types/Scalars/BooleanType.cs b/src/HotChocolate/Core/src/Types/Types/Scalars/BooleanType.cs
@@ -47,7 +47,7 @@ protected override bool ParseLiteral(BooleanValueNode literal)
 
         protected override BooleanValueNode ParseValue(bool value)
         {
-            return value ? BooleanValueNode.TrueLiteral : BooleanValueNode.FalseLiteral;
+            return value ? BooleanValueNode.True : BooleanValueNode.False;
         }
     }
 }
diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/ArgumentNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/ArgumentNode.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -42,6 +43,10 @@ public IEnumerable<ISyntaxNode> GetNodes()
             yield return Value;
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public ArgumentNode WithLocation(Location? location)
         {
             return new ArgumentNode(location, Name, Value);

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/BooleanValueNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/BooleanValueNode.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -145,23 +146,18 @@ public override int GetHashCode()
         /// A <see cref="string"/> that represents the current
         /// <see cref="BooleanValueNode"/>.
         /// </returns>
-        public override string? ToString()
-        {
-#if NETSTANDARD1_4
-            return Value.ToString();
-#else
-            return Value.ToString(CultureInfo.InvariantCulture);
-#endif
-        }
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
 
         public BooleanValueNode WithLocation(Location? location) =>
             new BooleanValueNode(location, Value);
 
         public BooleanValueNode WithValue(bool value) =>
             new BooleanValueNode(Location, value);
 
-        public static BooleanValueNode TrueLiteral { get; } = new BooleanValueNode(true);
+        public static BooleanValueNode True { get; } = new BooleanValueNode(true);
 
-        public static BooleanValueNode FalseLiteral { get; } = new BooleanValueNode(false);
+        public static BooleanValueNode False { get; } = new BooleanValueNode(false);
     }
 }
diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/Contracts/ISyntaxNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/Contracts/ISyntaxNode.cs
@@ -9,5 +9,7 @@ public interface ISyntaxNode
         Location? Location { get; }
 
         IEnumerable<ISyntaxNode> GetNodes();
+
+        string ToString(bool indented);
     }
 }
diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/DirectiveDefinitionNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/DirectiveDefinitionNode.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -61,6 +62,10 @@ public IEnumerable<ISyntaxNode> GetNodes()
             }
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public DirectiveDefinitionNode WithLocation(Location? location)
         {
             return new DirectiveDefinitionNode

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/DirectiveNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/DirectiveNode.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -57,6 +58,10 @@ public IEnumerable<ISyntaxNode> GetNodes()
 
         public IReadOnlyList<ArgumentNode> Arguments { get; }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public DirectiveNode WithLocation(Location? location)
         {
             return new DirectiveNode(location, Name, Arguments);

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/DocumentNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/DocumentNode.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -28,6 +29,10 @@ public DocumentNode(IReadOnlyList<IDefinitionNode> definitions)
 
         public IEnumerable<ISyntaxNode> GetNodes() => Definitions;
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public DocumentNode WithLocation(Location? location)
         {
             return new DocumentNode(location, Definitions);

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/EnumTypeDefinitionNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/EnumTypeDefinitionNode.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -41,6 +42,10 @@ public override IEnumerable<ISyntaxNode> GetNodes()
             }
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public override string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public EnumTypeDefinitionNode WithLocation(Location? location)
         {
             return new EnumTypeDefinitionNode(

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/EnumTypeExtensionNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/EnumTypeExtensionNode.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -32,6 +33,10 @@ public override IEnumerable<ISyntaxNode> GetNodes()
             }
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public override string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public EnumTypeExtensionNode WithLocation(Location? location)
         {
             return new EnumTypeExtensionNode(

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/EnumValueDefinitionNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/EnumValueDefinitionNode.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -34,6 +35,10 @@ public override IEnumerable<ISyntaxNode> GetNodes()
             }
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public override string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public EnumValueDefinitionNode WithLocation(Location? location)
         {
             return new EnumValueDefinitionNode(

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/EnumValueNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/EnumValueNode.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -197,10 +198,9 @@ public override int GetHashCode()
         /// A <see cref="string"/> that represents the current
         /// <see cref="EnumValueNode"/>.
         /// </returns>
-        public override string? ToString()
-        {
-            return Value;
-        }
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
 
         public unsafe ReadOnlySpan<byte> AsSpan()
         {

diff --git a/...nguage/src/Language/TypeNodeExtensions.cs → ...ntaxTree/Extensions/TypeNodeExtensions.cs b/...nguage/src/Language/TypeNodeExtensions.cs → ...ntaxTree/Extensions/TypeNodeExtensions.cs
diff --git a/...guage/src/Language/ValueNodeExtensions.cs → ...taxTree/Extensions/ValueNodeExtensions.cs b/...guage/src/Language/ValueNodeExtensions.cs → ...taxTree/Extensions/ValueNodeExtensions.cs
diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/FieldDefinitionNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/FieldDefinitionNode.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -52,6 +53,10 @@ public override IEnumerable<ISyntaxNode> GetNodes()
             }
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public override string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public FieldDefinitionNode WithLocation(Location? location)
         {
             return new FieldDefinitionNode(

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/FieldNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/FieldNode.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -55,6 +56,10 @@ public override IEnumerable<ISyntaxNode> GetNodes()
             }
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public override string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public FieldNode WithLocation(Location? location)
         {
             return new FieldNode(location, Name, Alias,

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/FloatFormat.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/FloatFormat.cs
@@ -1,6 +1,6 @@
 namespace HotChocolate.Language
 {
-    public enum FloatFormat : byte
+    public enum FloatFormat
     {
         FixedPoint = 0,
         Exponential = 1

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/FloatValueNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/FloatValueNode.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -226,10 +227,9 @@ public override int GetHashCode()
         /// A <see cref="string"/> that represents the current
         /// <see cref="FloatValueNode"/>.
         /// </returns>
-        public override string? ToString()
-        {
-            return Value;
-        }
+                public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
 
         public float ToSingle()
         {

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/FragmentDefinitionNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/FragmentDefinitionNode.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -46,6 +47,10 @@ public override IEnumerable<ISyntaxNode> GetNodes()
             yield return SelectionSet;
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public override string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public FragmentDefinitionNode WithLocation(Location? location)
         {
             return new FragmentDefinitionNode(

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/FragmentSpreadNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/FragmentSpreadNode.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -25,6 +26,10 @@ public override IEnumerable<ISyntaxNode> GetNodes()
             }
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public override string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public FragmentSpreadNode WithLocation(Location? location)
         {
             return new FragmentSpreadNode(location, Name, Directives);

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/HotChocolate.Language.SyntaxTree.csproj b/src/HotChocolate/Language/src/Language.SyntaxTree/HotChocolate.Language.SyntaxTree.csproj
@@ -14,10 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Visitors\" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/InlineFragmentNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/InlineFragmentNode.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -40,6 +41,10 @@ public IEnumerable<ISyntaxNode> GetNodes()
             yield return SelectionSet;
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public InlineFragmentNode WithLocation(Location? location)
         {
             return new InlineFragmentNode(

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/InputObjectTypeDefinitionNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/InputObjectTypeDefinitionNode.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -42,6 +43,10 @@ public override IEnumerable<ISyntaxNode> GetNodes()
             }
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public override string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public InputObjectTypeDefinitionNode WithLocation(Location? location)
         {
             return new InputObjectTypeDefinitionNode(

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/InputObjectTypeExtensionNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/InputObjectTypeExtensionNode.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -33,6 +34,10 @@ public override IEnumerable<ISyntaxNode> GetNodes()
             }
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public override string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public InputObjectTypeExtensionNode WithLocation(Location? location)
         {
             return new InputObjectTypeExtensionNode(

diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/InputValueDefinitionNode.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/InputValueDefinitionNode.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using HotChocolate.Language.Utilities;
 
 namespace HotChocolate.Language
 {
@@ -55,6 +56,10 @@ public override IEnumerable<ISyntaxNode> GetNodes()
             }
         }
 
+        public override string ToString() => SyntaxPrinter.Print(this, true);
+
+        public override string ToString(bool indented) => SyntaxPrinter.Print(this, indented);
+
         public InputValueDefinitionNode WithLocation(Location? location)
         {
             return new InputValueDefinitionNode(