fix(migrations): cf migration - stop removing empty newlines from i18n blocks (#53578)

thePunderWoman · thePunderWoman · commit e73205ff5ae4 · 2023-12-15T19:49:04.000Z
Since i18n sections are whitespace sensitive, we should avoid removing empty lines when inside an i18n block that were present before. PR Close #53578
diff --git a/packages/core/schematics/ng-generate/control-flow-migration/util.ts b/packages/core/schematics/ng-generate/control-flow-migration/util.ts
@@ -628,7 +628,7 @@ export function formatTemplate(tmpl: string, templateType: string): string {
         lineWasMigrated = true;
       }
       if ((line.trim() === '' && index !== 0 && index !== lines.length - 1) &&
-          (inMigratedBlock || lineWasMigrated)) {
+          (inMigratedBlock || lineWasMigrated) && !inI18nBlock) {
         // skip blank lines except if it's the first line or last line
         // this preserves leading and trailing spaces if they are already present
         continue;
diff --git a/packages/core/schematics/test/control_flow_migration_spec.ts b/packages/core/schematics/test/control_flow_migration_spec.ts
@@ -4729,6 +4729,7 @@ describe('control flow migration', () => {
         `</p>`,
         `<span *ngIf="show;else elseBlock" i18n>Content here</span>`,
         `<ng-template #elseBlock i18n>`,
+        `  `,
         `  <p>Else Content</p>`,
         `</ng-template>`,
         `</div>`,
@@ -4745,6 +4746,7 @@ describe('control flow migration', () => {
         `    <span i18n>Content here</span>`,
         `  } @else {`,
         `    <ng-container i18n>`,
+        `  `,
         `  <p>Else Content</p>`,
         `</ng-container>`,
         `  }`,

Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,7 @@ export function formatTemplate(tmpl: string, templateType: string): string {`
`628`	`628`	`lineWasMigrated = true;`
`629`	`629`	`}`
`630`	`630`	`if ((line.trim() === '' && index !== 0 && index !== lines.length - 1) &&`
`631`		`- (inMigratedBlock \|\| lineWasMigrated)) {`
	`631`	`+ (inMigratedBlock \|\| lineWasMigrated) && !inI18nBlock) {`
`632`	`632`	`// skip blank lines except if it's the first line or last line`
`633`	`633`	`// this preserves leading and trailing spaces if they are already present`
`634`	`634`	`continue;`