fix(nested): Fix false positive.

cartant · Apr 20, 2019 · a57f938 · a57f938
1 parent 6630f3f
commit a57f938
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/source/rules/rxjsNoNestedSubscribeRule.ts b/source/rules/rxjsNoNestedSubscribeRule.ts
@@ -30,7 +30,7 @@ export class Rule extends Lint.Rules.TypedRule {
     const failures: Lint.RuleFailure[] = [];
     const typeChecker = program.getTypeChecker();
 
-    const subscribeQuery = `CallExpression PropertyAccessExpression[name.name="subscribe"]`;
+    const subscribeQuery = `CallExpression > PropertyAccessExpression[name.name="subscribe"]`;
     const propertyAccessExpressions = tsquery(sourceFile, subscribeQuery);
     propertyAccessExpressions.forEach(node => {
       const propertyAccessExpression = node as ts.PropertyAccessExpression;
@@ -41,23 +41,25 @@ export class Rule extends Lint.Rules.TypedRule {
         );
         if (couldBeType(type, "Observable")) {
           callExpression.arguments.forEach(arg => {
-            const propertyAccessExpressions = tsquery(arg, subscribeQuery);
-            propertyAccessExpressions.forEach(node => {
-              const propertyAccessExpression = node as ts.PropertyAccessExpression;
-              const type = typeChecker.getTypeAtLocation(
-                propertyAccessExpression.expression
-              );
-              if (couldBeType(type, "Observable")) {
-                const { name } = propertyAccessExpression;
-                failures.push(
-                  new Lint.RuleFailure(
-                    sourceFile,
-                    name.getStart(),
-                    name.getStart() + name.getWidth(),
-                    Rule.FAILURE_STRING,
-                    this.ruleName
-                  )
+            const innerPropertyAccessExpressions = tsquery(arg, subscribeQuery);
+            innerPropertyAccessExpressions.forEach(node => {
+              const innerPropertyAccessExpression = node as ts.PropertyAccessExpression;
+              if (innerPropertyAccessExpression !== propertyAccessExpression) {
+                const type = typeChecker.getTypeAtLocation(
+                  innerPropertyAccessExpression.expression
                 );
+                if (couldBeType(type, "Observable")) {
+                  const { name } = innerPropertyAccessExpression;
+                  failures.push(
+                    new Lint.RuleFailure(
+                      sourceFile,
+                      name.getStart(),
+                      name.getStart() + name.getWidth(),
+                      Rule.FAILURE_STRING,
+                      this.ruleName
+                    )
+                  );
+                }
               }
             });
           });