fix(migrations): cf migration - fix bug in attribute formatting (#53636)

thePunderWoman · atscott · commit 22b95de9bcb9 · 2023-12-19T10:16:29.000-08:00
The formatting that would preserve attribute indents completely missed attributes that start on new lines rather than the same line as the opening element. PR Close #53636
diff --git a/packages/core/schematics/ng-generate/control-flow-migration/util.ts b/packages/core/schematics/ng-generate/control-flow-migration/util.ts
@@ -671,10 +671,12 @@ export function formatTemplate(tmpl: string, templateType: string): string {
       }
 
       // if a line ends in an unclosed attribute, we need to note that and close it later
-      if (!inAttribute && openAttrDoubleRegex.test(line)) {
+      const isOpenDoubleAttr = openAttrDoubleRegex.test(line);
+      const isOpenSingleAttr = openAttrSingleRegex.test(line);
+      if (!inAttribute && isOpenDoubleAttr) {
         inAttribute = true;
         isDoubleQuotes = true;
-      } else if (!inAttribute && openAttrSingleRegex.test(line)) {
+      } else if (!inAttribute && isOpenSingleAttr) {
         inAttribute = true;
         isDoubleQuotes = false;
       }
@@ -684,8 +686,9 @@ export function formatTemplate(tmpl: string, templateType: string): string {
           mindent + (line.trim() !== '' ? indent : '') + line.trim();
       formatted.push(newLine);
 
-      if ((inAttribute && isDoubleQuotes && closeAttrDoubleRegex.test(line)) ||
-          (inAttribute && !isDoubleQuotes && closeAttrSingleRegex.test(line))) {
+      if (!isOpenDoubleAttr && !isOpenSingleAttr &&
+          ((inAttribute && isDoubleQuotes && closeAttrDoubleRegex.test(line)) ||
+           (inAttribute && !isDoubleQuotes && closeAttrSingleRegex.test(line)))) {
         inAttribute = false;
       }
 
diff --git a/packages/core/schematics/test/control_flow_migration_spec.ts b/packages/core/schematics/test/control_flow_migration_spec.ts
@@ -4776,6 +4776,13 @@ describe('control flow migration', () => {
         `                    with cool things">`,
         `  Content here`,
         `</span>`,
+        `<span`,
+        `    i18n-message="this is a multi-`,
+        `                    line attribute`,
+        `                    that starts`,
+        `                    on a newline">`,
+        `  Different Content`,
+        `</span>`,
       ].join('\n'));
 
       await runMigration();
@@ -4789,6 +4796,13 @@ describe('control flow migration', () => {
         `                    with cool things">`,
         `  Content here`,
         `</span>`,
+        `<span`,
+        `    i18n-message="this is a multi-`,
+        `                    line attribute`,
+        `                    that starts`,
+        `                    on a newline">`,
+        `  Different Content`,
+        `</span>`,
       ].join('\n');
 
       expect(actual).toBe(expected);
@@ -4815,6 +4829,13 @@ describe('control flow migration', () => {
            `                    with cool things'>`,
            `  Content here`,
            `</span>`,
+           `<span`,
+           `    i18n-message='this is a multi-`,
+           `                    line attribute`,
+           `                    that starts`,
+           `                    on a newline'>`,
+           `  Different here`,
+           `</span>`,
          ].join('\n'));
 
          await runMigration();
@@ -4828,6 +4849,13 @@ describe('control flow migration', () => {
            `                    with cool things'>`,
            `  Content here`,
            `</span>`,
+           `<span`,
+           `    i18n-message='this is a multi-`,
+           `                    line attribute`,
+           `                    that starts`,
+           `                    on a newline'>`,
+           `  Different here`,
+           `</span>`,
          ].join('\n');
 
          expect(actual).toBe(expected);
