fix(cli): calculate padding of super.onCreate(savedInstanceState); li…

…ne (#6016)
ionic-team · Oct 21, 2022 · 5729ac1 · 5729ac1
1 parent f9ec5a3
commit 5729ac1
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/cli/src/tasks/migrate.ts b/cli/src/tasks/migrate.ts
@@ -955,19 +955,18 @@ async function migrateMainActivity(config: Config) {
     }
 
     const rindex = data.indexOf('registerPlugin');
+    const superLine = 'super.onCreate(savedInstanceState);';
     if (rindex !== -1) {
-      if (data.indexOf('super.onCreate(savedInstanceState);') < rindex) {
-        data = data.replace(
-          'super.onCreate(savedInstanceState);\n        ',
-          '',
-        );
+      if (data.indexOf(superLine) < rindex) {
+        const linePadding =
+          rindex - data.indexOf(superLine) - superLine.length - 1;
+        data = data.replace(`${superLine}\n${' '.repeat(linePadding)}`, '');
         const eindex = data.lastIndexOf('.class);') + 8;
         data = data.replace(
           data.substring(bindex, eindex),
-          `${data.substring(
-            bindex,
-            eindex,
-          )}\n        super.onCreate(savedInstanceState);`,
+          `${data.substring(bindex, eindex)}\n${
+            ' '.repeat(linePadding) + superLine.padStart(linePadding)
+          }`,
         );
       }
     }