From 488f5a067e3699e3d7d67ae0e520c4d84d15a27b Mon Sep 17 00:00:00 2001
From: kpdecker <kpdecker@gmail.com>
Date: Fri, 13 Nov 2015 13:42:53 -0600
Subject: [PATCH] Avoid duplicate auxiliary start if in aux section

Fixes #3032
---
 packages/babel-generator/src/printer.js          |  2 +-
 .../auxiliary-comment/overview/expected.js       | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/packages/babel-generator/src/printer.js b/packages/babel-generator/src/printer.js
index 447b37402d..2e74d4af97 100644
--- a/packages/babel-generator/src/printer.js
+++ b/packages/babel-generator/src/printer.js
@@ -66,7 +66,7 @@ export default class Printer extends Buffer {
 
   printAuxBeforeComment(wasInAux) {
     let comment = this.format.auxiliaryCommentBefore;
-    if (!wasInAux && this.insideAux) {
+    if (!wasInAux && this.insideAux && !this.printAuxAfterOnNextUserNode) {
       this.printAuxAfterOnNextUserNode = true;
       if (comment) this.printComment({
         type: "CommentBlock",
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 947e8a0b77..29633a5382 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
@@ -1,35 +1,29 @@
 /*before*/"use strict";
 
-/*before*/Object.defineProperty(exports, "__esModule", {
+Object.defineProperty(exports, "__esModule", {
   value: true
 });
-/*before*/exports.test = undefined;
-/*before*/
+exports.test = undefined;
+
 require("foo");
 
-/*before*/
 require("foo-bar");
 
-/*before*/
 require("./directory/foo-bar");
 
-/*before*/
 var _foo = require("foo2");
 
-/*before*/
 var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
-/*before*/
 var _foo3 = require("foo3");
 
-/*before*/var /*after*/foo2 = babelHelpers.interopRequireWildcard(_foo3);
+var /*after*/foo2 = babelHelpers.interopRequireWildcard(_foo3);
 /*before*/
 var _foo4 = require("foo4");
 
-/*before*/
 var _foo5 = require("foo5");
 
-/*before*/exports. /*after*/test = test;
+exports. /*after*/test = test;
 var test = /*before*/exports. /*after*/test = 5;
 
 /*before*/_foo4. /*after*/bar;