graphql-java
diff --git a/‎src/main/java/graphql/schema/idl/SchemaPrinter.java‎
Lines changed: 21 additions & 19 deletions b/‎src/main/java/graphql/schema/idl/SchemaPrinter.java‎
Lines changed: 21 additions & 19 deletions
@@ -447,11 +447,7 @@ public String print(GraphQLSchema schema) {
             printSchemaElement(out, element, visibility);
         }
 
-        String result = sw.toString();
-        if (result.endsWith("\n\n")) {
-            result = result.substring(0, result.length() - 1);
-        }
-        return result;
+        return trimNewLineChars(sw.toString());
     }
 
     private interface SchemaElementPrinter<T> {
@@ -796,7 +792,10 @@ String argsString(Class<? extends GraphQLSchemaElement> parent, List<GraphQLArgu
             if (count == 0) {
                 sb.append("(");
             } else {
-                sb.append(", ");
+                sb.append(",");
+                if (!hasDescriptions) {
+                    sb.append(" ");
+                }
             }
             if (hasDescriptions) {
                 sb.append("\n");
@@ -989,7 +988,7 @@ public String print(GraphQLType type) {
 
         printSchemaElement(out, type, DEFAULT_FIELD_VISIBILITY);
 
-        return sw.toString();
+        return trimNewLineChars(sw.toString());
     }
 
     public String print(List<GraphQLSchemaElement> elements) {
@@ -1005,7 +1004,7 @@ public String print(List<GraphQLSchemaElement> elements) {
                 Assert.assertShouldNeverHappen("How did we miss a %s", element.getClass());
             }
         }
-        return sw.toString();
+        return trimNewLineChars(sw.toString());
     }
 
     public String print(GraphQLDirective graphQLDirective) {
@@ -1025,22 +1024,19 @@ private String printComments(Object graphQLType, String prefix) {
     }
 
     private void printComments(PrintWriter out, Object graphQLType, String prefix) {
-
         String descriptionText = getDescription(graphQLType);
         if (isNullOrEmpty(descriptionText)) {
             return;
         }
 
-        if (!isNullOrEmpty(descriptionText)) {
-            List<String> lines = Arrays.asList(descriptionText.split("\n"));
-            if (options.isDescriptionsAsHashComments()) {
-                printMultiLineHashDescription(out, prefix, lines);
-            } else if (!lines.isEmpty()) {
-                if (lines.size() > 1) {
-                    printMultiLineDescription(out, prefix, lines);
-                } else {
-                    printSingleLineDescription(out, prefix, lines.get(0));
-                }
+        List<String> lines = Arrays.asList(descriptionText.split("\n"));
+        if (options.isDescriptionsAsHashComments()) {
+            printMultiLineHashDescription(out, prefix, lines);
+        } else if (!lines.isEmpty()) {
+            if (lines.size() > 1) {
+                printMultiLineDescription(out, prefix, lines);
+            } else {
+                printSingleLineDescription(out, prefix, lines.get(0));
             }
         }
     }
@@ -1133,6 +1129,12 @@ private Comparator<? super GraphQLSchemaElement> getComparator(Class<? extends G
         return options.comparatorRegistry.getComparator(environment);
     }
 
+    private static String trimNewLineChars(String s) {
+        if (s.endsWith("\n\n")) {
+            s = s.substring(0, s.length() - 1);
+        }
+        return s;
+    }
 
     private static boolean isNullOrEmpty(String s) {
         return s == null || s.isEmpty();