fix(migrations): inject migration dropping code if everything except super is removed (#58959)

crisbeto · pkozlowski-opensource · commit 4392ccedf997 · 2024-12-02T08:56:21.000+01:00
Fixes that in some cases the internal version of the migration was dropping code when all the statements after the `super` call are deleted. PR Close #58959
diff --git a/packages/core/schematics/ng-generate/inject-migration/migration.ts b/packages/core/schematics/ng-generate/inject-migration/migration.ts
@@ -230,8 +230,8 @@ function migrateClass(
     const nextStatement = getNextPreservedStatement(superCall, removedStatements);
     tracker.insertText(
       sourceFile,
-      nextStatement ? nextStatement.getFullStart() : superCall.getEnd() + 1,
-      `\n${afterSuper.join('\n')}\n`,
+      nextStatement ? nextStatement.getFullStart() : constructor.getEnd() - 1,
+      `\n${afterSuper.join('\n')}\n` + (nextStatement ? '' : memberIndentation),
     );
   }
 
diff --git a/packages/core/schematics/test/inject_migration_spec.ts b/packages/core/schematics/test/inject_migration_spec.ts
@@ -1714,8 +1714,8 @@ describe('inject migration', () => {
       `    const foo = inject(Foo, { optional: true }) ?? createFoo(bar);`,
       ``,
       `    super(foo);`,
+      `  `,
       `    this.foo = foo;`,
-      ``,
       `  }`,
       `}`,
     ]);
@@ -2579,5 +2579,49 @@ describe('inject migration', () => {
         `}`,
       ]);
     });
+
+    it('should be able to insert statements after the `super` call when all subsequent statements have been deleted', async () => {
+      writeFile(
+        '/dir.ts',
+        [
+          `import { Directive } from '@angular/core';`,
+          `import { Foo } from 'deps';`,
+          `import { Parent } from './parent';`,
+          ``,
+          `@Directive()`,
+          `class MyDir extends Parent {`,
+          `  private value: number;`,
+          ``,
+          `  constructor(private foo: Foo) {`,
+          `    super(foo, bar);`,
+          `    this.value = this.foo.getValue();`,
+          `  }`,
+          `}`,
+        ].join('\n'),
+      );
+
+      await runInternalMigration();
+
+      expect(tree.readContent('/dir.ts').split('\n')).toEqual([
+        `import { Directive, inject } from '@angular/core';`,
+        `import { Foo } from 'deps';`,
+        `import { Parent } from './parent';`,
+        ``,
+        `@Directive()`,
+        `class MyDir extends Parent {`,
+        `  private foo: Foo;`,
+        ``,
+        `  private value: number = this.foo.getValue();`,
+        ``,
+        `  constructor() {`,
+        `    const foo = inject(Foo);`,
+        ``,
+        `    super(foo, bar);`,
+        `  `,
+        `    this.foo = foo;`,
+        `  }`,
+        `}`,
+      ]);
+    });
   });
 });
