small refactor and added docstring based on code review

erik-krogh · erik-krogh · commit 34d0f727063a · 2019-10-08T11:54:57.000+02:00
diff --git a/javascript/ql/src/Statements/UseOfReturnlessFunction.ql b/javascript/ql/src/Statements/UseOfReturnlessFunction.ql
@@ -33,9 +33,6 @@ predicate benignContext(Expr e) {
   
   // A return statement is often used to just end the function.
   e = any(Function f).getAReturnedExpr()
-  or
-  // The call is only in a non-void context because it is in a lambda.
-  e = any(ArrowFunctionExpr arrow).getBody()
   or 
   exists(ConditionalExpr cond | cond.getABranch() = e and benignContext(cond)) 
   or 
@@ -47,31 +44,31 @@ predicate benignContext(Expr e) {
   or
   exists(Expr parent | parent.getUnderlyingValue() = e and benignContext(parent))
   or 
-  exists(VoidExpr voidExpr | voidExpr.getOperand() = e)
+  any(VoidExpr voidExpr).getOperand() = e
 
   or
   // weeds out calls inside HTML-attributes.
-  e.getContainer() instanceof CodeInAttribute or  
+  e.getParent() instanceof CodeInAttribute or  
   // and JSX-attributes.
   e = any(JSXAttribute attr).getValue() or 
   
   // It is ok (or to be flagged by another query?) to await a non-async function. 
   exists(AwaitExpr await | await.getOperand() = e and benignContext(await)) 
   or
   // Avoid double reporting with js/trivial-conditional
-  exists(ASTNode cond | isExplicitConditional(cond, e))
+  isExplicitConditional(_, e)
   or 
   // Avoid double reporting with js/comparison-between-incompatible-types
-  exists(Comparison binOp | binOp.getAnOperand() = e)
+  any(Comparison binOp).getAnOperand() = e
   or
   // Avoid double reporting with js/property-access-on-non-object
-  exists(PropAccess ac | ac.getBase() = e)
+  any(PropAccess ac).getBase() = e
   or
   // Avoid double-reporting with js/unused-local-variable
   exists(VariableDeclarator v | v.getInit() = e and v.getBindingPattern().getVariable() instanceof UnusedLocal)
   or
   // Avoid double reporting with js/call-to-non-callable
-  exists(InvokeExpr invoke | invoke.getCallee() = e)
+  any(InvokeExpr invoke).getCallee() = e
 }
 
 predicate functionBlacklist(Function f) {
diff --git a/javascript/ql/src/Statements/UselessConditional.qll b/javascript/ql/src/Statements/UselessConditional.qll
@@ -1,3 +1,7 @@
+/** 
+ * Provides predicates for working with useless conditionals.  
+ */ 
+
 import javascript
 
 /**

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +/**
 + * Provides predicates for working with useless conditionals.
 + */
++
 import javascript
 /**