fix(rule): detect trackBy function when ngFor spans multiple lines (#813

)
mgechev · Apr 22, 2019 · 2260dfd · 2260dfd
1 parent 1fb5d8a
commit 2260dfd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/templateUseTrackByFunctionRule.ts b/src/templateUseTrackByFunctionRule.ts
@@ -5,7 +5,7 @@ import { SourceFile } from 'typescript/lib/typescript';
 import { NgWalker, NgWalkerConfig } from './angular/ngWalker';
 import { BasicTemplateAstVisitor } from './angular/templates/basicTemplateAstVisitor';
 
-const PATTERN = /\s*ngFor.*\s*trackBy\s*:|\[ngForTrackBy\]\s*=\s*['"].*['"]/;
+const PATTERN = /trackBy\s*:|\[ngForTrackBy\]\s*=\s*['"].*['"]/;
 // current offset into the template
 let currentOffset = 0;
 

diff --git a/test/templateUseTrackByFunctionRule.spec.ts b/test/templateUseTrackByFunctionRule.spec.ts
@@ -213,5 +213,23 @@ describe(ruleName, () => {
       `;
       assertSuccess(ruleName, source);
     });
+
+    it('should succeed when trackBy function is on a different line', () => {
+      const source = `
+        @Component({
+          template: \`
+            <div *ngFor="
+              let item of [1, 2, 3];
+              let i = index;
+              trackBy : trackByFn
+            ">
+              {{ item }}
+            </div>
+          \`
+        })
+        class Bar {}
+      `;
+      assertSuccess(ruleName, source);
+    });
   });
 });