Make use of getContainer

robertbrignull · robertbrignull · commit dcd81b5847b8 · 2020-05-04T15:16:23.000+01:00
diff --git a/queries/undeclared-action-input.ql b/queries/undeclared-action-input.ql
@@ -36,14 +36,16 @@ class ActionDeclaration extends File {
 }
 
 Expr getAFunctionChildExpr(Function f) {
-  result = f.getBody().getAChildStmt*().getAChildExpr*()
+  result.getContainer() = f
 }
 
 /*
  * Result is a function that is called from the body of the given function `f`
  */
 Function calledBy(Function f) {
   result = getAFunctionChildExpr(f).(InvokeExpr).getResolvedCallee()
+  or
+  result.getEnclosingContainer() = f // assume outer function causes inner function to be called
 }
 
 class GetInputMethodCallExpr extends MethodCallExpr {

Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,16 @@ class ActionDeclaration extends File {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`Expr getAFunctionChildExpr(Function f) {`
`39`		`- result = f.getBody().getAChildStmt().getAChildExpr()`
	`39`	`+ result.getContainer() = f`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/*`
`43`	`43`	* Result is a function that is called from the body of the given function `f`
`44`	`44`	`*/`
`45`	`45`	`Function calledBy(Function f) {`
`46`	`46`	`result = getAFunctionChildExpr(f).(InvokeExpr).getResolvedCallee()`
	`47`	`+ or`
	`48`	`+ result.getEnclosingContainer() = f // assume outer function causes inner function to be called`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`class GetInputMethodCallExpr extends MethodCallExpr {`