fix(es/codegen): Improve comments handling (#10534)

Author: magic-akari

.changeset/modern-crews-glow.md

@@ -0,0 +1,6 @@
+---
+swc_core: minor
+swc_ecma_codegen: minor
+---
+
+fix(es/codegen): Improve comments handling

crates/swc/tests/fixture/issues-5xxx/5272/1/output/a.map

@@ -1,5 +1,5 @@
 {
-  "mappings": ";;;+BACaA;;;eAAAA;;;;;;;oBADQ;AACd,IAAA,AAAMA,oBAAN;;gBAAMA;aAAAA;kCAAAA;eAAN,oBAAMA;;oBAAAA;;YACTC,KAAAA;mBAAAA,SAAAA;gBACI,OAAO,IAAI,IAAI,CAACC,GAAG;YACvB;;;WAHSF;EAAYG,UAAI",
+  "mappings": ";;;+BACaA;;;eAAAA;;;;;;;oBADQ;AACd,IAAA,AAAMA,oBAAN;;gBAAMA;aAAAA;kCAAAA;QAAN,OAAA,oBAAMA;;oBAAAA;;YACTC,KAAAA;mBAAAA,SAAAA;gBACI,OAAO,IAAI,IAAI,CAACC,GAAG;YACvB;;;WAHSF;EAAYG,UAAI",
   "names": [
     "Foo",
     "bar",

crates/swc/tests/tsc-references/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.1.normal.js

@@ -12,8 +12,7 @@ var Point = /*#__PURE__*/ function() {
             x: 0,
             y: 0
         };
-    } // unexpected error here bug 840246
-    ;
+    }; // unexpected error here bug 840246
     return Point;
 }();
 (function(Point) {
@@ -35,8 +34,7 @@ var Point = /*#__PURE__*/ function() {
                 x: 0,
                 y: 0
             };
-        } // unexpected error here bug 840246
-        ;
+        }; // unexpected error here bug 840246
         return Point;
     }();
     A.Point = Point;

crates/swc/tests/tsc-references/ES5SymbolProperty5.1.normal.js

@@ -10,5 +10,4 @@ var C = /*#__PURE__*/ function() {
     _proto[Symbol.iterator] = function() {};
     return C;
 }();
-(new C)[Symbol.iterator](0) // Should error
-;
+(new C)[Symbol.iterator](0); // Should error

crates/swc/tests/tsc-references/ambientDeclarationsPatterns_merging3.1.normal.js

@@ -1,5 +1,4 @@
 //// [types.ts]
 //// [test.ts]
-ohno.a // oh no
-;
+ohno.a; // oh no
 export { };

crates/swc/tests/tsc-references/arraySpreadInCall.1.normal.js

@@ -105,5 +105,4 @@ var x44 = f4.apply(void 0, [
 (_action = action).run.apply(_action, [
     100,
     'foo'
-] // error
-);
+]); // error

crates/swc/tests/tsc-references/asiPreventsParsingAsAmbientExternalModule01.1.normal.js

@@ -1,10 +1,7 @@
 //// [asiPreventsParsingAsAmbientExternalModule01.ts]
 var declare;
 var module;
-declare // this is the identifier 'declare'
-;
-module // this is the identifier 'module'
-;
-"my external module" // this is just a string
-;
+declare; // this is the identifier 'declare'
+module; // this is the identifier 'module'
+"my external module"; // this is just a string
 {} // this is a block body

crates/swc/tests/tsc-references/asiPreventsParsingAsAmbientExternalModule02.1.normal.js

@@ -2,12 +2,9 @@
 var declare;
 var module;
 (function(container) {
-    declare // this is the identifier 'declare'
-    ;
-    module // this is the identifier 'module'
-    ;
-    "my external module" // this is just a string
-    ;
+    declare; // this is the identifier 'declare'
+    module; // this is the identifier 'module'
+    "my external module"; // this is just a string
     {}
 })(container || (container = {}));
 var container;

crates/swc/tests/tsc-references/asiPreventsParsingAsNamespace02.1.normal.js

@@ -1,8 +1,6 @@
 //// [asiPreventsParsingAsNamespace02.ts]
 var module;
 var m;
-module // this is the identifier 'namespace'
-;
-m // this is the identifier 'm'
-;
+module; // this is the identifier 'namespace'
+m; // this is the identifier 'm'
 {} // this is a block body

crates/swc/tests/tsc-references/assignParameterPropertyToPropertyDeclarationES2022.1.normal.js

@@ -7,35 +7,26 @@ class C {
     quench;
     quanch;
     m1() {
-        this.foo // ok
-        ;
+        this.foo; // ok
     }
     m3;
     constructor(foo){
         this.foo = foo;
-        this.qux = this.bar // should error
-        ;
-        this.bar = this.foo // should error
-        ;
-        this.quiz = this.bar // ok
-        ;
-        this.quench = this.m1() // ok
-        ;
-        this.quanch = this.m3() // should error
-        ;
+        this.qux = this.bar; // should error
+        this.bar = this.foo; // should error
+        this.quiz = this.bar; // ok
+        this.quench = this.m1(); // ok
+        this.quanch = this.m3(); // should error
         this.m3 = function() {};
-        this.quim = this.baz // should error
-        ;
-        this.baz = this.foo;
-        this.quid = this.baz // ok
-        ;
+        this.quim = this.baz; // should error
+        this.baz = this.foo; // should error
+        this.quid = this.baz; // ok
     }
     quim;
     baz;
     quid;
     m2() {
-        this.foo // ok
-        ;
+        this.foo; // ok
     }
 }
 class D extends C {
@@ -48,7 +39,7 @@ class E {
     foo1;
     constructor(foo2){
         this.foo2 = foo2;
-        this.bar = ()=>this.foo1 + this.foo2;
+        this.bar = ()=>this.foo1 + this.foo2; // both ok
         this.foo1 = '';
     }
 }

crates/swc/tests/tsc-references/assignParameterPropertyToPropertyDeclarationESNext.1.normal.js

@@ -7,35 +7,26 @@ class C {
     quench;
     quanch;
     m1() {
-        this.foo // ok
-        ;
+        this.foo; // ok
     }
     m3;
     constructor(foo){
         this.foo = foo;
-        this.qux = this.bar // should error
-        ;
-        this.bar = this.foo // should error
-        ;
-        this.quiz = this.bar // ok
-        ;
-        this.quench = this.m1() // ok
-        ;
-        this.quanch = this.m3() // should error
-        ;
+        this.qux = this.bar; // should error
+        this.bar = this.foo; // should error
+        this.quiz = this.bar; // ok
+        this.quench = this.m1(); // ok
+        this.quanch = this.m3(); // should error
         this.m3 = function() {};
-        this.quim = this.baz // should error
-        ;
-        this.baz = this.foo;
-        this.quid = this.baz // ok
-        ;
+        this.quim = this.baz; // should error
+        this.baz = this.foo; // should error
+        this.quid = this.baz; // ok
     }
     quim;
     baz;
     quid;
     m2() {
-        this.foo // ok
-        ;
+        this.foo; // ok
     }
 }
 class D extends C {
@@ -48,7 +39,7 @@ class E {
     foo1;
     constructor(foo2){
         this.foo2 = foo2;
-        this.bar = ()=>this.foo1 + this.foo2;
+        this.bar = ()=>this.foo1 + this.foo2; // both ok
         this.foo1 = '';
     }
 }

crates/swc/tests/tsc-references/assignmentCompatWithCallSignaturesWithOptionalParameters.1.normal.js

@@ -3,9 +3,8 @@
 var b;
 var a;
 a = function() {
-    return 1 // ok, same number of required params
-    ;
-};
+    return 1;
+}; // ok, same number of required params
 a = function(x) {
     return 1;
 }; // ok, same number of required params

crates/swc/tests/tsc-references/assignmentCompatWithGenericCallSignatures3.1.normal.js

@@ -2,5 +2,4 @@
 // some complex cases of assignment compat of generic signatures that stress contextual signature instantiation
 var g;
 var h;
-g = h // ok
-;
+g = h; // ok

crates/swc/tests/tsc-references/callOverload.1.normal.js

@@ -1,8 +1,7 @@
 //// [callOverload.ts]
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 var n;
-fn(1) // no error
-;
+fn(1); // no error
 fn(1, 2, 3, 4);
 takeTwo(1, 2, 3, 4);
 withRest.apply(void 0, [

crates/swc/tests/tsc-references/callWithMissingVoid.1.normal.js

@@ -14,18 +14,12 @@ var X = /*#__PURE__*/ function() {
     };
     return X;
 }();
-x.f() // no error because f expects void
-;
-xUnion.f(42) // no error because f accepts number
-;
-xUnion.f() // no error because f accepts void
-;
-xAny.f() // error, any still expects an argument
-;
-xUnknown.f() // error, unknown still expects an argument
-;
-xNever.f() // error, never still expects an argument
-;
+x.f(); // no error because f expects void
+xUnion.f(42); // no error because f accepts number
+xUnion.f(); // no error because f accepts void
+xAny.f(); // error, any still expects an argument
+xUnknown.f(); // error, unknown still expects an argument
+xNever.f(); // error, never still expects an argument
 // Promise has previously been updated to work without arguments, but to show this fixes the issue too.
 var MyPromise = function MyPromise(executor) {
     "use strict";
@@ -63,33 +57,25 @@ c(3); // ok
 c(); // ok
 call(function(x1, y) {
     return x1 + y;
-}) // error
-;
+}); // error
 call(function(x1, y) {
     return x1 + y;
-}, 4, 2) // ok
-;
+}, 4, 2); // ok
 call(function(x1, y) {
     return x1;
-}, 4, void 0) // ok
-;
+}, 4, void 0); // ok
 call(function(x1, y) {
     return x1;
-}, 4) // ok
-;
+}, 4); // ok
 call(function(x1, y) {
     return 42;
-}) // ok
-;
+}); // ok
 call(function(x1, y) {
     return 42;
-}) // ok
-;
+}); // ok
 call(function(x1, y) {
     return 42;
-}, 4) // ok
-;
+}, 4); // ok
 call(function(x1, y) {
     return 42;
-}, 4, 2) // ok
-;
+}, 4, 2); // ok

crates/swc/tests/tsc-references/callWithSpread2.1.normal.js

@@ -31,8 +31,7 @@ rest.apply(void 0, [
 rest.apply(void 0, [
     "f"
 ].concat(_to_consumable_array(tuple)));
-prefix.apply(void 0, _to_consumable_array(ns)) // required parameters are required
-;
+prefix.apply(void 0, _to_consumable_array(ns)); // required parameters are required
 prefix.apply(void 0, _to_consumable_array(mixed));
 prefix.apply(void 0, _to_consumable_array(tuple));
 prefix2.apply(void 0, [

crates/swc/tests/tsc-references/classAbstractSuperCalls.1.normal.js

@@ -44,8 +44,7 @@ var C = /*#__PURE__*/ function(B) {
     };
     _proto.qux = function qux() {
         return _get(_get_prototype_of(C.prototype), "foo", this).call(this) || _get(_get_prototype_of(C.prototype), "foo", this);
-    } // 2 errors, foo is abstract
-    ;
+    }; // 2 errors, foo is abstract
     _proto.norf = function norf() {
         return _get(_get_prototype_of(C.prototype), "bar", this).call(this);
     };

crates/swc/tests/tsc-references/classConstructorAccessibility2.1.normal.js

@@ -81,12 +81,10 @@ var DerivedB = /*#__PURE__*/ function(BaseB1) {
     };
     _proto.createBaseInstance = function createBaseInstance() {
         new BaseB(8);
-    } // ok
-    ;
+    }; // ok
     DerivedB.staticBaseInstance = function staticBaseInstance() {
         new BaseB(9);
-    } // ok
-    ;
+    }; // ok
     return DerivedB;
 }(BaseB);
 var DerivedC = /*#__PURE__*/ function(BaseC1) {
@@ -106,12 +104,10 @@ var DerivedC = /*#__PURE__*/ function(BaseC1) {
     };
     _proto.createBaseInstance = function createBaseInstance() {
         new BaseC(10);
-    } // error
-    ;
+    }; // error
     DerivedC.staticBaseInstance = function staticBaseInstance() {
         new BaseC(11);
-    } // error
-    ;
+    }; // error
     return DerivedC;
 }(BaseC);
 var ba = new BaseA(1);

crates/swc/tests/tsc-references/classConstructorAccessibility5.1.normal.js

@@ -15,8 +15,7 @@ var Derived = /*#__PURE__*/ function(Base1) {
     }
     Derived.make = function make() {
         new Base();
-    } // ok
-    ;
+    }; // ok
     return Derived;
 }(Base);
 var Unrelated = /*#__PURE__*/ function() {
@@ -26,7 +25,6 @@ var Unrelated = /*#__PURE__*/ function() {
     }
     Unrelated.fake = function fake() {
         new Base();
-    } // error
-    ;
+    }; // error
     return Unrelated;
 }();

crates/swc/tests/tsc-references/classConstructorParametersAccessibility.1.normal.js

@@ -8,24 +8,21 @@ var C1 = function C1(x) {
     this.x = x;
 };
 var c1;
-c1.x // OK
-;
+c1.x; // OK
 var C2 = function C2(p) {
     "use strict";
     _class_call_check(this, C2);
     this.p = p;
 };
 var c2;
-c2.p // private, error
-;
+c2.p; // private, error
 var C3 = function C3(p) {
     "use strict";
     _class_call_check(this, C3);
     this.p = p;
 };
 var c3;
-c3.p // protected, error
-;
+c3.p; // protected, error
 var Derived = /*#__PURE__*/ function(C3) {
     "use strict";
     _inherits(Derived, C3);