WIP: Smalle fixes to make kitchen-sink example work

Author: tailhook

src/schema/format.rs

@@ -40,6 +40,7 @@ impl Displayable for Document {
 
 impl Displayable for Definition {
     fn display(&self, f: &mut Formatter) {
+        f.margin();
         match *self {
             Definition::SchemaDefinition(ref s) => s.display(f),
             Definition::TypeDefinition(ref t) => t.display(f),
@@ -283,8 +284,9 @@ impl Displayable for EnumType {
                 f.endline();
             }
             f.end_block();
+        } else {
+            f.endline();
         }
-        f.endline();
     }
 }
 

tests/schema_roundtrips.rs

@@ -47,5 +47,4 @@ fn roundtrip2(filename: &str) {
 #[test] fn input_type() { roundtrip("input_type"); }
 #[test] fn extend_input() { roundtrip2("extend_input"); }
 #[test] fn directive() { roundtrip("directive"); }
-// Not yet fully supported
-// #[test] fn kitchen_sink() { roundtrip2("kitchen-sink"); }
+#[test] fn kitchen_sink() { roundtrip2("kitchen-sink"); }

tests/schemas/enum.graphql

@@ -2,4 +2,3 @@ enum Site {
   DESKTOP
   MOBILE
 }
-

tests/schemas/implements.graphql

@@ -1,2 +1,3 @@
 type Type1 implements IOne
+
 type Type1 implements IOne & ITwo

tests/schemas/implements_amp_canonical.graphql

@@ -1,2 +1,3 @@
 type Type1 implements IOne & ITwo
+
 type Type2 implements IOne

tests/schemas/kitchen-sink_canonical.graphql

@@ -4,8 +4,8 @@ schema {
 }
 
 """
-This is a description
-of the `Foo` type.
+  This is a description
+  of the `Foo` type.
 """
 type Foo implements Bar & Baz {
   one: Type
@@ -50,7 +50,7 @@ union Feed = Story | Article | Advert
 
 union AnnotatedUnion @onUnion = A | B
 
-union AnnotatedUnionTwo @onUnion = | A | B
+union AnnotatedUnionTwo @onUnion = A | B
 
 union UndefinedUnion
 
@@ -94,19 +94,13 @@ input AnnotatedInput @onInputObject {
 input UndefinedInput
 
 extend input InputType {
-  other: Float = 1.23e4
+  other: Float = 12300
 }
 
 extend input InputType @onInputObject
 
 directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-directive @include(if: Boolean!)
-  on FIELD
-   | FRAGMENT_SPREAD
-   | INLINE_FRAGMENT
+directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-directive @include2(if: Boolean!) on
-  | FIELD
-  | FRAGMENT_SPREAD
-  | INLINE_FRAGMENT
+directive @include2(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT