Improve comments generation (#14979)

Co-authored-by: Nicolò Ribaudo <nicolo.ribaudo@gmail.com>

packages/babel-cli/test/fixtures/babel-external-helpers/--whitelist/stdout.txt

@@ -1,6 +1,5 @@
 (function (global) {
   var babelHelpers = global.babelHelpers = {};
-
   function _defineProperties(target, props) {
     for (var i = 0; i < props.length; i++) {
       var descriptor = props[i];
@@ -10,7 +9,6 @@
       Object.defineProperty(target, descriptor.key, descriptor);
     }
   }
-
   function _createClass(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
@@ -19,6 +17,5 @@
     });
     return Constructor;
   }
-
   babelHelpers.createClass = _createClass;
 })(typeof global === "undefined" ? self : global);

packages/babel-cli/test/fixtures/babel/filename default comments/out-files/script2.js

@@ -3,6 +3,9 @@
 /*
  Test comment
  */
+
 arr.map(function (x) {
   return x * MULTIPLIER;
-}); // END OF FILE
+});
+
+// END OF FILE

packages/babel-core/test/api.js

@@ -625,7 +625,6 @@ describe("api", function () {
         '    throw new TypeError("Cannot call a class as a function");',
         "  }",
         "}",
-        "",
         "let Foo = function Foo() {",
         "  _classCallCheck(this, Foo);",
         "};",
@@ -636,7 +635,7 @@ describe("api", function () {
 
     expect(
       originalPositionFor(consumer, {
-        line: 7,
+        line: 6,
         column: 4,
       }),
     ).toEqual({
@@ -710,7 +709,7 @@ describe("api", function () {
       ],
     }).then(function (result) {
       expect(result.code).toBe(
-        "/*before*/\nstart;\n\n/*after*/\nclass Foo {}\n\n/*before*/\nend;\n\n/*after*/",
+        "/*before*/\nstart;\n/*after*/\nclass Foo {}\n/*before*/\nend;\n/*after*/",
       );
     });
   });

packages/babel-core/test/fixtures/transformation/misc/regression-1130/output.js

@@ -1,7 +1,6 @@
 function A() {
   var a;
 }
-
 function B() {
   var a;
 }

packages/babel-core/test/fixtures/transformation/misc/regression-1155/output.js

@@ -2,19 +2,14 @@ var Foo = /*#__PURE__*/function (_Bar) {
   "use strict";
 
   babelHelpers.inherits(Foo, _Bar);
-
   var _super = babelHelpers.createSuper(Foo);
-
   function Foo(options) {
     babelHelpers.classCallCheck(this, Foo);
     var parentOptions = {};
-
     parentOptions.init = function () {
       this;
     };
-
     return _super.call(this, parentOptions);
   }
-
   return babelHelpers.createClass(Foo);
 }(Bar);

packages/babel-core/test/fixtures/transformation/misc/regression-1169/output.js

@@ -1,12 +1,10 @@
 function foo() {
   var input = ['a', 'b', 'c'];
   var output = {};
-
   for (var _i = 0, _input = input; _i < _input.length; _i++) {
     var c = _input[_i];
     var name = c;
     output[name] = name;
   }
-
   return output;
 }

packages/babel-core/test/fixtures/transformation/misc/regression-1199/output.js

@@ -1,7 +1,5 @@
 const bug = 1;
-
 function foo() {}
-
 function bar() {
   var bug;
   bug = 2;

packages/babel-core/test/fixtures/transformation/misc/regression-2364/output.js

@@ -1,7 +1,6 @@
 function wrapper(fn) {
   return function () {
     var _arguments = arguments;
-
     var _loop = function () {
       var val = fn(..._arguments);
       return {
@@ -10,10 +9,8 @@ function wrapper(fn) {
         })
       };
     };
-
     while (someCondition) {
       var _ret = _loop();
-
       if (typeof _ret === "object") return _ret.v;
     }
   };

packages/babel-core/test/fixtures/transformation/misc/regression-2765/output.js

@@ -1,32 +1,26 @@
 function f() {
   var _this = this;
-
   let g = /*#__PURE__*/function () {
     var _ref = babelHelpers.asyncToGenerator(function* () {
       _this;
     });
-
     return function g() {
       return _ref.apply(this, arguments);
     };
   }();
 }
-
 class Class {
   m() {
     var _this2 = this;
-
     return babelHelpers.asyncToGenerator(function* () {
       var c = /*#__PURE__*/function () {
         var _ref2 = babelHelpers.asyncToGenerator(function* (b) {
           _this2;
         });
-
         return function c(_x) {
           return _ref2.apply(this, arguments);
         };
       }();
     })();
   }
-
 }

packages/babel-core/test/fixtures/transformation/misc/regression-2892/output.js

@@ -4,12 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var Foo = /*#__PURE__*/function () {
   function Foo() {
     babelHelpers.classCallCheck(this, Foo);
   }
-
   babelHelpers.createClass(Foo, [{
     key: "bar",
     value: function () {
@@ -20,35 +18,28 @@ var Foo = /*#__PURE__*/function () {
             switch (_context.prev = _context.next) {
               case 0:
                 baz = 0;
-
               case 1:
               case "end":
                 return _context.stop();
             }
           }
         }, _callee);
       }));
-
       function bar() {
         return _bar.apply(this, arguments);
       }
-
       return bar;
     }()
   }]);
   return Foo;
 }();
-
 exports["default"] = Foo;
-
 function foo() {
   return _foo.apply(this, arguments);
 }
-
 function _foo() {
   _foo = babelHelpers.asyncToGenerator( /*#__PURE__*/babelHelpers.regeneratorRuntime().mark(function _callee3() {
     var bar, _bar2;
-
     return babelHelpers.regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -61,7 +52,6 @@ function _foo() {
                     switch (_context2.prev = _context2.next) {
                       case 0:
                         baz = {};
-
                       case 1:
                       case "end":
                         return _context2.stop();
@@ -71,11 +61,9 @@ function _foo() {
               }));
               return _bar2.apply(this, arguments);
             };
-
             bar = function _bar3() {
               return _bar2.apply(this, arguments);
             };
-
           case 2:
           case "end":
             return _context3.stop();

packages/babel-core/test/fixtures/transformation/source-maps/arrow-function/options.json

@@ -1,3 +1,4 @@
 {
-  "plugins": ["transform-arrow-functions", "transform-function-name"]
+  "plugins": ["transform-arrow-functions", "transform-function-name"],
+  "sourceMap": true
 }

packages/babel-core/test/fixtures/transformation/source-maps/class/options.json

@@ -1,3 +1,4 @@
 {
-  "plugins": ["transform-classes", "transform-block-scoping"]
+  "plugins": ["transform-classes", "transform-block-scoping"],
+  "sourceMap": true
 }

packages/babel-core/test/fixtures/transformation/source-maps/class/output.js

@@ -4,7 +4,6 @@ var Test = /*#__PURE__*/function () {
   function Test() {
     babelHelpers.classCallCheck(this, Test);
   }
-
   babelHelpers.createClass(Test, [{
     key: "bar",
     get: function () {
@@ -13,6 +12,5 @@ var Test = /*#__PURE__*/function () {
   }]);
   return Test;
 }();
-
 var test = new Test();
 test.bar;

packages/babel-core/test/fixtures/transformation/source-maps/input-source-map-complex/options.json

@@ -1,3 +1,4 @@
 {
-  "plugins": ["transform-modules-commonjs"]
+  "plugins": ["transform-modules-commonjs"],
+  "sourceMap": true
 }

packages/babel-core/test/fixtures/transformation/source-maps/input-source-map-complex/output.js

@@ -91,13 +91,11 @@ exports.default = void 0;
 //
 var _default = {
   name: 'HelloWorld',
-
   data() {
     return {
       msg: 'Welcome to Your Vue.js App'
     };
   }
-
 }; //
 //
 //
@@ -116,5 +114,4 @@ var _default = {
 //
 //
 //
-
 exports.default = _default;