#417 Fixed several false positives in the noStringBased rules

closes #417
microsoft · Apr 16, 2018 · 231b944 · 231b944
1 parent 7196a26
commit 231b944
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/utils/NoStringParameterToFunctionCallWalker.ts b/src/utils/NoStringParameterToFunctionCallWalker.ts
@@ -27,8 +27,21 @@ export class NoStringParameterToFunctionCallWalker extends ScopedSymbolTrackingW
 
     private validateExpression(node : ts.CallExpression) : void {
         const functionName : string = AstUtils.getFunctionName(node);
+        const functionTarget : string = AstUtils.getFunctionTarget(node);
+        const functionTargetType : string = this.getFunctionTargetType(node);
         const firstArg : ts.Expression = node.arguments[0];
         if (functionName === this.targetFunctionName && firstArg != null) {
+            if (functionTarget) {
+                if (functionTargetType) {
+                    if (!functionTargetType.match(/^(any|Window|Worker)$/)) {
+                        return;
+                    }
+                } else {
+                    if (!functionTarget.match(/^(this|window)$/)) {
+                        return;
+                    }
+                }
+            }
             if (!this.isExpressionEvaluatingToFunction(firstArg)) {
                 const msg : string = this.failureString + firstArg.getFullText().trim().substring(0, 40);
                 this.addFailureAt(node.getStart(), node.getWidth(), msg);

diff --git a/src/utils/ScopedSymbolTrackingWalker.ts b/src/utils/ScopedSymbolTrackingWalker.ts
@@ -21,6 +21,15 @@ export class ScopedSymbolTrackingWalker extends ErrorTolerantWalker {
         }
     }
 
+    protected getFunctionTargetType(expression: ts.CallExpression) : string {
+        if (expression.expression.kind === ts.SyntaxKind.PropertyAccessExpression && this.typeChecker) {
+            const propExp : ts.PropertyAccessExpression = <ts.PropertyAccessExpression>expression.expression;
+            const targetType: ts.Type = this.typeChecker.getTypeAtLocation(propExp.expression);
+            return this.typeChecker.typeToString(targetType);
+        }
+        return null;
+    }
+
     protected isExpressionEvaluatingToFunction(expression : ts.Expression) : boolean {
         if (expression.kind === ts.SyntaxKind.ArrowFunction
             || expression.kind === ts.SyntaxKind.FunctionExpression) {