Extract type access expression for parameter types

tamasvajk · igfoo · commit d6cbcdc847f6 · 2022-05-10T19:51:29.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -503,7 +503,11 @@ open class KotlinFileExtractor(
     private fun extractValueParameter(vp: IrValueParameter, parent: Label<out DbCallable>, idx: Int, typeSubstitution: TypeSubstitution?, parentSourceDeclaration: Label<out DbCallable>, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?): TypeResults {
         with("value parameter", vp) {
             val location = getLocation(vp, classTypeArgsIncludingOuterClasses)
-            return extractValueParameter(useValueParameter(vp, parent), vp.type, vp.name.asString(), location, parent, idx, typeSubstitution, useValueParameter(vp, parentSourceDeclaration), vp.isVararg)
+            val id = useValueParameter(vp, parent)
+            if (!isExternalDeclaration(vp)) {
+                extractTypeAccessRecursive(vp.type, location, id, -1)
+            }
+            return extractValueParameter(id, vp.type, vp.name.asString(), location, parent, idx, typeSubstitution, useValueParameter(vp, parentSourceDeclaration), vp.isVararg)
         }
     }
 
diff --git a/java/ql/test/kotlin/library-tests/exprs_typeaccess/PrintAst.expected b/java/ql/test/kotlin/library-tests/exprs_typeaccess/PrintAst.expected
@@ -49,13 +49,17 @@ A.kt:
 #   16|           0: [TypeAccess] Integer
 #-----|       4: (Parameters)
 #   16|         0: [Parameter] i
+#   16|           0: [TypeAccess] C<C<Integer>>
+#   16|             0: [TypeAccess] C<Integer>
+#   16|               0: [TypeAccess] Integer
 #   16|       5: [BlockStmt] { ... }
 #   16|         0: [ReturnStmt] return ...
 #   16|           0: [VarAccess] i
 #   17|     10: [Method] fn
 #   17|       3: [TypeAccess] int
 #-----|       4: (Parameters)
 #   17|         0: [Parameter] i
+#   17|           0: [TypeAccess] int
 #   17|       5: [BlockStmt] { ... }
 #   18|         0: [LocalVariableDeclStmt] var ...;
 #   18|           1: [LocalVariableDeclExpr] x
@@ -75,6 +79,7 @@ A.kt:
 #    0|         3: [TypeAccess] Enu
 #-----|         4: (Parameters)
 #    0|           0: [Parameter] value
+#    0|             0: [TypeAccess] String
 #   23|       3: [Constructor] Enu
 #   23|         5: [BlockStmt] { ... }
 #   23|           0: [ExprStmt] <Expr>;

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,11 @@ open class KotlinFileExtractor(`
`503`	`503`	`private fun extractValueParameter(vp: IrValueParameter, parent: Label<out DbCallable>, idx: Int, typeSubstitution: TypeSubstitution?, parentSourceDeclaration: Label<out DbCallable>, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?): TypeResults {`
`504`	`504`	`with("value parameter", vp) {`
`505`	`505`	`val location = getLocation(vp, classTypeArgsIncludingOuterClasses)`
`506`		`- return extractValueParameter(useValueParameter(vp, parent), vp.type, vp.name.asString(), location, parent, idx, typeSubstitution, useValueParameter(vp, parentSourceDeclaration), vp.isVararg)`
	`506`	`+ val id = useValueParameter(vp, parent)`
	`507`	`+ if (!isExternalDeclaration(vp)) {`
	`508`	`+ extractTypeAccessRecursive(vp.type, location, id, -1)`
	`509`	`+ }`
	`510`	`+ return extractValueParameter(id, vp.type, vp.name.asString(), location, parent, idx, typeSubstitution, useValueParameter(vp, parentSourceDeclaration), vp.isVararg)`
`507`	`511`	`}`
`508`	`512`	`}`
`509`	`513`