From 03e2f1bb25693d1a5f4e53fc4f4cd1937cf6bda1 Mon Sep 17 00:00:00 2001
From: Jessica Janiuk <jessicajaniuk@google.com>
Date: Wed, 29 Nov 2023 11:26:56 -0500
Subject: [PATCH] fix(migrations): fix regexp for else and then in cf migration
 (#53257)

The regexp for then and else did not ignore alphanumeric characters prior to the then and else. So if a string contained then, for example Authentication, it would incorrectly match as a then clause.

fixes: #53252

PR Close #53257
---
 .../ng-generate/control-flow-migration/ifs.ts |  4 +--
 .../test/control_flow_migration_spec.ts       | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/packages/core/schematics/ng-generate/control-flow-migration/ifs.ts b/packages/core/schematics/ng-generate/control-flow-migration/ifs.ts
index 49b2c528ad1..5224b734dd6 100644
--- a/packages/core/schematics/ng-generate/control-flow-migration/ifs.ts
+++ b/packages/core/schematics/ng-generate/control-flow-migration/ifs.ts
@@ -68,8 +68,8 @@ export function migrateIf(template: string):
 }
 
 function migrateNgIf(etm: ElementToMigrate, tmpl: string, offset: number): Result {
-  const matchThen = etm.attr.value.match(/;?\s*then/gm);
-  const matchElse = etm.attr.value.match(/;?\s*else/gm);
+  const matchThen = etm.attr.value.match(/[^\w\d];?\s*then/gm);
+  const matchElse = etm.attr.value.match(/[^\w\d];?\s*else/gm);
 
   if (etm.thenAttr !== undefined || etm.elseAttr !== undefined) {
     // bound if then / if then else
diff --git a/packages/core/schematics/test/control_flow_migration_spec.ts b/packages/core/schematics/test/control_flow_migration_spec.ts
index 25291ca0bd3..d61624eb34c 100644
--- a/packages/core/schematics/test/control_flow_migration_spec.ts
+++ b/packages/core/schematics/test/control_flow_migration_spec.ts
@@ -425,6 +425,37 @@ describe('control flow migration', () => {
       ].join('\n'));
     });
 
+    it('should migrate an if else case with condition that has `then` in the string', async () => {
+      writeFile('/comp.ts', `
+        import {Component} from '@angular/core';
+        import {NgIf,NgIfElse} from '@angular/common';
+
+        @Component({
+          templateUrl: './comp.html'
+        })
+        class Comp {
+          show = false;
+        }
+      `);
+
+      writeFile('/comp.html', [
+        `<div *ngIf="!(isAuthenticated$ | async) && !reauthRequired">`,
+        `  Hello!`,
+        `</div>`,
+      ].join('\n'));
+
+      await runMigration();
+      const content = tree.readContent('/comp.html');
+
+      expect(content).toBe([
+        `@if (!(isAuthenticated$ | async) && !reauthRequired) {`,
+        `  <div>`,
+        `    Hello!`,
+        `  </div>`,
+        `}`,
+      ].join('\n'));
+    });
+
     it('should migrate an if case on a container', async () => {
       writeFile('/comp.ts', `
         import {Component} from '@angular/core';