Type-variable-in-scope consistency query: account for all enclosing elements that declare type parameters.

Author: smowton

java/ql/consistency-queries/typeParametersInScope.ql

@@ -30,14 +30,22 @@ Type getATypeUsedInClass(RefType type) {
   result = getAMentionedType(getATypeUsedInClass(type))
 }
 
-TypeVariable getATypeVariableInScope(RefType type) {
-  result = type.getACallable().(GenericCallable).getATypeParameter()
-  or
-  result = type.(GenericType).getATypeParameter()
-  or
-  result = getAMentionedType(type.(InstantiatedType).getATypeArgument())
+Element getEnclosingElementStar(RefType e) {
+  result = e
   or
-  result = getATypeVariableInScope(type.getEnclosingType())
+  result.contains(e)
+}
+
+TypeVariable getATypeVariableInScope(RefType type) {
+  exists(Element e | e = getEnclosingElementStar(type) |
+    result = e.(RefType).getACallable().(GenericCallable).getATypeParameter()
+    or
+    result = e.(GenericType).getATypeParameter()
+    or
+    result = e.(GenericCallable).getATypeParameter()
+    or
+    result = getAMentionedType(e.(InstantiatedType).getATypeArgument())
+  )
 }
 
 from ClassOrInterface typeUser, TypeVariable outOfScope