review changes

Author: IvanGoncharov

src/language/__tests__/printer-test.ts

@@ -121,19 +121,19 @@ describe('Printer: Query document', () => {
       {
         trip(
           obj: {
-            wheelchair: false,
-            smallObj: { a: 1 },
+            wheelchair: false
+            smallObj: { a: 1 }
             largeObj: {
-              wheelchair: false,
-              smallObj: { a: 1 },
-              arriveBy: false,
-              includePlannedCancellations: true,
-              transitDistanceReluctance: 2000,
+              wheelchair: false
+              smallObj: { a: 1 }
+              arriveBy: false
+              includePlannedCancellations: true
+              transitDistanceReluctance: 2000
               anotherLongFieldName: "Lots and lots and lots and lots of text"
-            },
-            arriveBy: false,
-            includePlannedCancellations: true,
-            transitDistanceReluctance: 2000,
+            }
+            arriveBy: false
+            includePlannedCancellations: true
+            transitDistanceReluctance: 2000
             anotherLongFieldName: "Lots and lots and lots and lots of text"
           }
         ) {
@@ -154,10 +154,10 @@ describe('Printer: Query document', () => {
       {
         trip(
           list: [
-            ["small array", "small", "small"],
+            ["small array", "small", "small"]
             [
-              "Lots and lots and lots and lots of text",
-              "Lots and lots and lots and lots of text",
+              "Lots and lots and lots and lots of text"
+              "Lots and lots and lots and lots of text"
               "Lots and lots and lots and lots of text"
             ]
           ]

src/language/printer.ts

@@ -150,18 +150,18 @@ const printDocASTReducer: ASTReducer<string> = {
   EnumValue: { leave: ({ value }) => value },
   ListValue: {
     leave: ({ values }) => {
-      if (values.reduce((t, v) => t + v.length + 2, 0) > MAX_LINE_LENGTH) {
-        return '[\n' + indent(join(values, ',\n')) + '\n]';
+      const valuesLine = '[' + join(values, ', ') + ']';
+
+      if (valuesLine.length > MAX_LINE_LENGTH) {
+        return '[\n' + indent(join(values, '\n')) + '\n]';
       }
-      return '[' + join(values, ', ') + ']';
+      return valuesLine;
     },
   },
   ObjectValue: {
     leave: ({ fields }) => {
-      if (fields.reduce((t, f) => t + f.length + 2, 0) > MAX_LINE_LENGTH) {
-        return '{\n' + indent(join(fields, ',\n')) + '\n}';
-      }
-      return '{ ' + join(fields, ', ') + ' }';
+      const fieldsLine = '{ ' + join(fields, ', ') + ' }';
+      return fieldsLine.length > MAX_LINE_LENGTH ? block(fields) : fieldsLine;
     },
   },
   ObjectField: { leave: ({ name, value }) => name + ': ' + value },