Extract extension method receivers as parameters

tamasvajk · igfoo · commit abc0da3e608f · 2022-05-10T19:51:08.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -348,8 +348,12 @@ open class KotlinFileExtractor(
         val locId = tw.getLocation(f)
 
         val id = useFunction<DbCallable>(f)
+
+        val extReceiver = f.extensionReceiverParameter
+        val isExtension = extReceiver != null
+        val idxOffset = if (isExtension) 1 else 0
         val paramTypes = f.valueParameters.mapIndexed { i, vp ->
-            extractValueParameter(vp, id, i)
+            extractValueParameter(vp, id, i + idxOffset)
         }
         val paramsSignature = paramTypes.joinToString(separator = ",", prefix = "(", postfix = ")") { it.javaResult.signature!! }
 
@@ -363,11 +367,11 @@ open class KotlinFileExtractor(
             val shortName = f.name.asString()
             @Suppress("UNCHECKED_CAST")
             tw.writeMethods(id as Label<DbMethod>, shortName, "$shortName$paramsSignature", returnType.javaResult.id, returnType.kotlinResult.id, parentId, id)
-
-            val extReceiver = f.extensionReceiverParameter
+            
             if (extReceiver != null) {
                 val extendedType = useType(extReceiver.type)
                 tw.writeKtExtensionFunctions(id, extendedType.javaResult.id, extendedType.kotlinResult.id)
+                extractValueParameter(extReceiver, id, 0)
             }
         }
 
@@ -688,21 +692,23 @@ open class KotlinFileExtractor(
             }
 
             val dr = c.dispatchReceiver
-            val er = c.extensionReceiver
             if (dr != null) {
                 extractExpressionExpr(dr, callable, id, -1, enclosingStmt)
+            }
 
-                if (er != null && er != dr) {
-                    logger.warnElement(Severity.ErrorSevere, "Expected to only find extension receiver or dispatch receiver. Found both. Extracting dispatch receiver only", c)
-                }
-            } else if (er != null) {
-                extractExpressionExpr(er, callable, id, -1, enclosingStmt)
+            val er = c.extensionReceiver
+            val idxOffset: Int
+            if (er != null) {
+                extractExpressionExpr(er, callable, id, 0, enclosingStmt)
+                idxOffset = 1
+            } else {
+                idxOffset = 0
             }
 
             for(i in 0 until c.valueArgumentsCount) {
                 val arg = c.getValueArgument(i)
                 if(arg != null) {
-                    extractExpressionExpr(arg, callable, id, i, enclosingStmt)
+                    extractExpressionExpr(arg, callable, id, i + idxOffset, enclosingStmt)
                 }
             }
         }
diff --git a/java/ql/test/kotlin/library-tests/methods/parameters.expected b/java/ql/test/kotlin/library-tests/methods/parameters.expected
@@ -3,9 +3,11 @@
 | methods2.kt:7:1:10:1 | equals | methods2.kt:7:1:10:1 | other | 0 |
 | methods2.kt:8:5:9:5 | fooBarClassMethod | methods2.kt:8:27:8:32 | x | 0 |
 | methods2.kt:8:5:9:5 | fooBarClassMethod | methods2.kt:8:35:8:40 | y | 1 |
-| methods3.kt:3:1:3:39 | fooBarTopLevelMethod | methods3.kt:3:30:3:35 | x | 0 |
+| methods3.kt:3:1:3:39 | fooBarTopLevelMethod | methods3.kt:3:5:3:7 | <this> | 0 |
+| methods3.kt:3:1:3:39 | fooBarTopLevelMethod | methods3.kt:3:30:3:35 | x | 1 |
 | methods3.kt:5:1:7:1 | equals | methods3.kt:5:1:7:1 | other | 0 |
-| methods3.kt:6:5:6:43 | fooBarTopLevelMethod | methods3.kt:6:34:6:39 | x | 0 |
+| methods3.kt:6:5:6:43 | fooBarTopLevelMethod | methods3.kt:6:9:6:11 | <this> | 0 |
+| methods3.kt:6:5:6:43 | fooBarTopLevelMethod | methods3.kt:6:34:6:39 | x | 1 |
 | methods4.kt:3:1:11:1 | equals | methods4.kt:3:1:11:1 | other | 0 |
 | methods4.kt:5:3:9:3 | equals | methods4.kt:5:3:9:3 | other | 0 |
 | methods4.kt:7:5:7:34 | m | methods4.kt:7:11:7:29 | x | 0 |
diff --git a/java/ql/test/kotlin/library-tests/variables/variableAccesses.expected b/java/ql/test/kotlin/library-tests/variables/variableAccesses.expected
@@ -6,6 +6,7 @@ varAcc
 | variables.kt:16:11:16:18 | o |
 | variables.kt:16:11:16:18 | o |
 instAcc
+| variables.kt:21:9:21:9 | this |
 | variables.kt:21:11:21:15 | this |
 | variables.kt:24:9:24:9 | this |
 | variables.kt:25:9:25:9 | this |
diff --git a/java/ql/test/kotlin/library-tests/variables/variables.expected b/java/ql/test/kotlin/library-tests/variables/variables.expected
@@ -7,5 +7,6 @@
 | variables.kt:16:1:34:1 | other | Object | file://:0:0:0:0 | <none> |
 | variables.kt:16:11:16:18 | o | C1 | file://:0:0:0:0 | <none> |
 | variables.kt:16:11:16:18 | o | C1 | variables.kt:16:11:16:18 | o |
+| variables.kt:23:9:23:10 | <this> | C1 | file://:0:0:0:0 | <none> |
 | variables.kt:36:1:45:1 | other | Object | file://:0:0:0:0 | <none> |
 | variables.kt:38:11:44:5 | other | Object | file://:0:0:0:0 | <none> |
