From 3e1a661eb62de1cb95d30ce2f25944b2b8266281 Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Mon, 25 Apr 2016 19:59:14 -0700
Subject: [PATCH] Use the general list handlers and the default separator.

---
 packages/babel-generator/src/generators/classes.js     |  8 ++++----
 packages/babel-generator/src/generators/flow.js        | 10 ++++------
 packages/babel-generator/src/generators/modules.js     |  4 ++--
 packages/babel-generator/src/generators/types.js       |  4 ++--
 .../test/fixtures/minified/modules/expected.js         |  2 +-
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/packages/babel-generator/src/generators/classes.js b/packages/babel-generator/src/generators/classes.js
index e6c499186c..9d4e5cf24f 100644
--- a/packages/babel-generator/src/generators/classes.js
+++ b/packages/babel-generator/src/generators/classes.js
@@ -1,5 +1,5 @@
 export function ClassDeclaration(node: Object) {
-  this.printJoin(node.decorators, node, { separator: "" });
+  this.printJoin(node.decorators, node);
   this.push("class");
 
   if (node.id) {
@@ -17,7 +17,7 @@ export function ClassDeclaration(node: Object) {
 
   if (node.implements) {
     this.push(" implements ");
-    this.printJoin(node.implements, node, { separator: ", " });
+    this.printList(node.implements, node);
   }
 
   this.space();
@@ -43,7 +43,7 @@ export function ClassBody(node: Object) {
 }
 
 export function ClassProperty(node: Object) {
-  this.printJoin(node.decorators, node, { separator: "" });
+  this.printJoin(node.decorators, node);
 
   if (node.static) this.push("static ");
   this.print(node.key, node);
@@ -58,7 +58,7 @@ export function ClassProperty(node: Object) {
 }
 
 export function ClassMethod(node: Object) {
-  this.printJoin(node.decorators, node, { separator: "" });
+  this.printJoin(node.decorators, node);
 
   if (node.static) {
     this.push("static ");
diff --git a/packages/babel-generator/src/generators/flow.js b/packages/babel-generator/src/generators/flow.js
index 10645fab0a..2c52a5a6e1 100644
--- a/packages/babel-generator/src/generators/flow.js
+++ b/packages/babel-generator/src/generators/flow.js
@@ -112,11 +112,11 @@ export function _interfaceish(node: Object) {
   this.print(node.typeParameters, node);
   if (node.extends.length) {
     this.push(" extends ");
-    this.printJoin(node.extends, node, { separator: ", " });
+    this.printList(node.extends, node);
   }
   if (node.mixins && node.mixins.length) {
     this.push(" mixins ");
-    this.printJoin(node.mixins, node, { separator: ", " });
+    this.printList(node.mixins, node);
   }
   this.space();
   this.print(node.body, node);
@@ -159,7 +159,7 @@ export function ThisTypeAnnotation() {
 
 export function TupleTypeAnnotation(node: Object) {
   this.push("[");
-  this.printJoin(node.types, node, { separator: ", " });
+  this.printList(node.types, node);
   this.push("]");
 }
 
@@ -209,8 +209,7 @@ export function TypeParameter(node: Object) {
 
 export function TypeParameterInstantiation(node: Object) {
   this.push("<");
-  this.printJoin(node.params, node, {
-    separator: ", ",
+  this.printList(node.params, node, {
     iterator: (node: Object) => {
       this.print(node.typeAnnotation, node);
     }
@@ -228,7 +227,6 @@ export function ObjectTypeAnnotation(node: Object) {
     this.space();
 
     this.printJoin(props, node, {
-      separator: false,
       indent: true,
       iterator: () => {
         if (props.length !== 1) {
diff --git a/packages/babel-generator/src/generators/modules.js b/packages/babel-generator/src/generators/modules.js
index 825bf8d56b..904e7093bf 100644
--- a/packages/babel-generator/src/generators/modules.js
+++ b/packages/babel-generator/src/generators/modules.js
@@ -81,7 +81,7 @@ function ExportDeclaration(node: Object) {
       this.push("{");
       if (specifiers.length) {
         this.space();
-        this.printJoin(specifiers, node, { separator: ", " });
+        this.printList(specifiers, node);
         this.space();
       }
       this.push("}");
@@ -121,7 +121,7 @@ export function ImportDeclaration(node: Object) {
     if (specifiers.length) {
       this.push("{");
       this.space();
-      this.printJoin(specifiers, node, { separator: ", " });
+      this.printList(specifiers, node);
       this.space();
       this.push("}");
     }
diff --git a/packages/babel-generator/src/generators/types.js b/packages/babel-generator/src/generators/types.js
index 731a2f17cb..ba0f4cb49c 100644
--- a/packages/babel-generator/src/generators/types.js
+++ b/packages/babel-generator/src/generators/types.js
@@ -48,12 +48,12 @@ export function ObjectExpression(node: Object) {
 export { ObjectExpression as ObjectPattern };
 
 export function ObjectMethod(node: Object) {
-  this.printJoin(node.decorators, node, { separator: "" });
+  this.printJoin(node.decorators, node);
   this._method(node);
 }
 
 export function ObjectProperty(node: Object) {
-  this.printJoin(node.decorators, node, { separator: "" });
+  this.printJoin(node.decorators, node);
 
   if (node.computed) {
     this.push("[");
diff --git a/packages/babel-generator/test/fixtures/minified/modules/expected.js b/packages/babel-generator/test/fixtures/minified/modules/expected.js
index 1c03cdd973..1ce58c20ad 100644
--- a/packages/babel-generator/test/fixtures/minified/modules/expected.js
+++ b/packages/babel-generator/test/fixtures/minified/modules/expected.js
@@ -1 +1 @@
-import * as foo from "foo";import {foo as bar, foo2 as bar2} from "foo";import {foo2} from "foo";export * from "foo";export {foo as bar} from "foo";export {foo} from "foo";
+import * as foo from "foo";import {foo as bar,foo2 as bar2} from "foo";import {foo2} from "foo";export * from "foo";export {foo as bar} from "foo";export {foo} from "foo";