feat: make angular whitespace configuragble

mgechev · Jun 16, 2017 · 09c12d3 · 09c12d3
1 parent 3a06b48
commit 09c12d3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/src/angularWhitespaceRule.ts b/src/angularWhitespaceRule.ts
@@ -25,7 +25,13 @@ const getReplacements = (text: ast.BoundTextAst, absolutePosition: number) => {
   ];
 };
 
-class InterpolationWhitespaceVisitor extends BasicTemplateAstVisitor {
+type Option = 'check-interpolation' | 'check-pipe';
+
+interface ConfigurableVisitor {
+  getOption(): Option;
+}
+
+class InterpolationWhitespaceVisitor extends BasicTemplateAstVisitor implements ConfigurableVisitor {
   visitBoundText(text: ast.BoundTextAst, context: BasicTemplateAstVisitor): any {
     if (ExpTypes.ASTWithSource(text.value)) {
       // Note that will not be reliable for different interpolation symbols
@@ -49,15 +55,21 @@ class InterpolationWhitespaceVisitor extends BasicTemplateAstVisitor {
     }
     return null;
   }
+
+  getOption(): Option {
+    return 'check-interpolation';
+  }
 }
 
 class WhitespaceTemplateVisitor extends BasicTemplateAstVisitor {
-  private visitors = [
+  private visitors: (BasicTemplateAstVisitor & ConfigurableVisitor)[] = [
     new InterpolationWhitespaceVisitor(this.getSourceFile(), this.getOptions(), this.context, this.templateStart)
   ];
 
   visitBoundText(text: ast.BoundTextAst, context: any): any {
+    const options = this.getOptions();
     this.visitors
+      .filter(v => options.indexOf(v.getOption()) >= 0)
       .map(v => v.visitBoundText(text, this))
       .filter(f => !!f)
       .forEach(f => this.addFailure(f));

diff --git a/test/angularWhitespaceRule.spec.ts b/test/angularWhitespaceRule.spec.ts
@@ -13,7 +13,7 @@ describe.only('angular-whitespace', () => {
       })
       class Bar {}
       `;
-      assertSuccess('angular-whitespace', source);
+      assertSuccess('angular-whitespace', source, ['check-interpolation']);
     });
 
     it('should work with proper style and complex expressions', () => {
@@ -25,7 +25,7 @@ describe.only('angular-whitespace', () => {
       })
       class Bar {}
       `;
-      assertSuccess('angular-whitespace', source);
+      assertSuccess('angular-whitespace', source, ['check-interpolation']);
     });
 
     it('should work with properties', () => {
@@ -37,7 +37,7 @@ describe.only('angular-whitespace', () => {
       })
       class Bar {}
       `;
-      assertSuccess('angular-whitespace', source);
+      assertSuccess('angular-whitespace', source, ['check-interpolation']);
     });
   });
 
@@ -55,7 +55,8 @@ describe.only('angular-whitespace', () => {
       assertAnnotated({
         ruleName: 'angular-whitespace',
         message: 'Missing whitespace in interpolation; expecting {{ expr }}',
-        source
+        source,
+        options: ['check-interpolation']
       });
     });
   });
@@ -73,7 +74,8 @@ describe.only('angular-whitespace', () => {
       const failures =  assertAnnotated({
         ruleName: 'angular-whitespace',
         message: 'Missing whitespace in interpolation; expecting {{ expr }}',
-        source
+        source,
+        options: ['check-interpolation']
       });
 
       const res = Replacement.applyAll(source, failures[0].getFix());
@@ -99,7 +101,8 @@ describe.only('angular-whitespace', () => {
       const failures =  assertAnnotated({
         ruleName: 'angular-whitespace',
         message: 'Extra whitespace in interpolation; expecting {{ expr }}',
-        source
+        source,
+        options: ['check-interpolation']
       });
 
       const res = Replacement.applyAll(source, failures[0].getFix());