From 9e382b16861a4b87bc48f6233ef6fc969665d62c Mon Sep 17 00:00:00 2001
From: kpdecker <kpdecker@gmail.com>
Date: Fri, 18 Dec 2015 01:37:26 -0600
Subject: [PATCH] Fix aux comment termination in lists and calls

---
 packages/babel-generator/src/generators/expressions.js        | 1 +
 packages/babel-generator/src/printer.js                       | 4 ++++
 .../test/fixtures/auxiliary-comment/overview/actual.js        | 2 +-
 .../test/fixtures/auxiliary-comment/overview/expected.js      | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/babel-generator/src/generators/expressions.js b/packages/babel-generator/src/generators/expressions.js
index db021892af..832f818a22 100644
--- a/packages/babel-generator/src/generators/expressions.js
+++ b/packages/babel-generator/src/generators/expressions.js
@@ -92,6 +92,7 @@ export function Decorator(node: Object) {
 
 export function CallExpression(node: Object) {
   this.print(node.callee, node);
+  if (node.loc) this.printAuxAfterComment();
 
   this.push("(");
 
diff --git a/packages/babel-generator/src/printer.js b/packages/babel-generator/src/printer.js
index 9ba7865893..4158f132bd 100644
--- a/packages/babel-generator/src/printer.js
+++ b/packages/babel-generator/src/printer.js
@@ -130,6 +130,10 @@ export default class Printer extends Buffer {
           opts.iterator(node, i);
         }
 
+        if (opts.separator && parent.loc) {
+          this.printAuxAfterComment();
+        }
+
         if (opts.separator && i < len - 1) {
           this.push(opts.separator);
         }
diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/actual.js
index df37d9e5a5..cdcfa374df 100644
--- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/actual.js
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/actual.js
@@ -9,7 +9,7 @@ import {foo as bar2} from "foo5";
 export {test};
 export var test = 5;
 
-bar(foo);
+bar(foo, bar2);
 
 /* my comment */
 bar2;
diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/expected.js
index 49880b4ef2..f821389ada 100644
--- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/expected.js
@@ -26,7 +26,7 @@ var _foo5 = require("foo5");
 exports. /*after*/test = test;
 var test = /*before*/exports. /*after*/test = 5;
 
-/*before*/(0, _foo4.bar)(_foo2.default) /*after*/;
+/*before*/(0, _foo4.bar) /*after*/( /*before*/_foo2.default /*after*/, /*before*/_foo5.foo /*after*/);
 
 /* my comment */
 /*before*/_foo5.foo; /*after*/