fix: ensure organize imports doesn't mess with generated $$Component type

dummdidumm · dummdidumm · commit 10820f9817eb · 2024-11-22T21:02:38.000+01:00
#2594
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/HoistableInterfaces.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/HoistableInterfaces.ts
@@ -337,16 +337,20 @@ export class HoistableInterfaces {
             for (const [name, node] of hoistable) {
                 let pos = node.pos + astOffset;
 
-                // node.pos includes preceeding whitespace, which could mean we accidentally also move stuff appended to a previous node
-                if (name !== '$$ComponentProps') {
+                if (name === '$$ComponentProps') {
+                    // So that organize imports doesn't mess with the types
+                    str.prependRight(pos, '\n');
+                } else {
+                    // node.pos includes preceeding whitespace, which could mean we accidentally also move stuff appended to a previous node
                     if (str.original[pos] === '\r') {
                         pos++;
                     }
                     if (/\s/.test(str.original[pos])) {
                         pos++;
                     }
 
-                    // jsdoc comments would be ignored if they are on the same line as the ;, so we add a newline, too
+                    // jsdoc comments would be ignored if they are on the same line as the ;, so we add a newline, too.
+                    // Also helps with organize imports not messing with the types
                     str.prependRight(pos, ';\n');
                     str.appendLeft(node.end + astOffset, ';');
                 }
