Merge remote-tracking branch 'origin/next' into fb/protect-the-top-of…

…-file # Conflicts: # src/utils/get-comment-registry.ts # tests/ImportCommentsPreserved/__snapshots__/ppsi.spec.ts.snap # tests/ImportCommentsPreserved/import-comments-trailing-specifier-comment-lost.ts
IanVS · May 15, 2023 · 99cceda · 99cceda
2 parents 1e2ff94 + f7f0689
commit 99cceda
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/src/utils/get-comment-registry.ts b/src/utils/get-comment-registry.ts
@@ -431,6 +431,14 @@ export function attachCommentsToOutputNodes(
                 ];
 
             ownerNode = lastSpecifier;
+
+            // Start the comment on the line below the owner, to avoid gaps
+            if (
+                comment.loc?.start.line !== undefined &&
+                ownerNode.loc?.end.line
+            ) {
+                comment.loc.start.line = ownerNode.loc?.end.line + 1;
+            }
         }
 
         if (!ownerNode) {

diff --git a/tests/ImportCommentsPreserved/__snapshots__/ppsi.spec.ts.snap b/tests/ImportCommentsPreserved/__snapshots__/ppsi.spec.ts.snap
@@ -241,6 +241,12 @@ import {
     /* @ts-expect-error*/
 } from "c";
 
+import {
+    b4,
+    a4,
+    // @ts-expect-error
+} from "c2";
+
 import {
     b2,a2,
     // @ts-expect-error
@@ -256,7 +262,6 @@ import {
 import {
     a1,
     b1,
-
     // @ts-expect-error
 } from "a";
 import {
@@ -265,5 +270,10 @@ import {
     // @ts-expect-error
 } from "b";
 import { a3, b3 } from /* @ts-expect-error*/ "c";
+import {
+    a4,
+    b4,
+    // @ts-expect-error
+} from "c2";
 
 `;
diff --git a/tests/ImportCommentsPreserved/import-comments-trailing-specifier-comment-lost.ts b/tests/ImportCommentsPreserved/import-comments-trailing-specifier-comment-lost.ts
@@ -4,6 +4,12 @@ import {
     /* @ts-expect-error*/
 } from "c";
 
+import {
+    b4,
+    a4,
+    // @ts-expect-error
+} from "c2";
+
 import {
     b2,a2,
     // @ts-expect-error