Fix missing extension receiver extraction

tamasvajk · igfoo · commit 874afa7fd71a · 2022-05-10T19:51:06.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -687,9 +687,17 @@ open class KotlinFileExtractor(
             }
 
             val dr = c.dispatchReceiver
-            if(dr != null) {
+            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)
             }
+
             for(i in 0 until c.valueArgumentsCount) {
                 val arg = c.getValueArgument(i)
                 if(arg != null) {
diff --git a/java/ql/test/kotlin/library-tests/exprs/exprs.expected b/java/ql/test/kotlin/library-tests/exprs/exprs.expected
@@ -539,11 +539,14 @@
 | exprs.kt:199:19:199:20 | ...!! | exprs.kt:198:1:200:1 | notNullAssertion | NotNullExpr |
 | exprs.kt:202:1:215:1 | <obinit>(...) | exprs.kt:202:1:215:1 | Class2 | MethodAccess |
 | exprs.kt:205:9:205:29 | a | exprs.kt:203:5:214:5 | x | LocalVariableDeclExpr |
+| exprs.kt:205:17:205:18 | aa | exprs.kt:203:5:214:5 | x | VarAccess |
 | exprs.kt:205:20:205:29 | toString(...) | exprs.kt:203:5:214:5 | x | MethodAccess |
 | exprs.kt:206:9:206:27 | b0 | exprs.kt:203:5:214:5 | x | LocalVariableDeclExpr |
+| exprs.kt:206:19:206:19 | s | exprs.kt:203:5:214:5 | x | VarAccess |
 | exprs.kt:206:21:206:27 | plus(...) | exprs.kt:203:5:214:5 | x | MethodAccess |
 | exprs.kt:206:26:206:26 | 5 | exprs.kt:203:5:214:5 | x | IntegerLiteral |
 | exprs.kt:207:9:207:23 | b1 | exprs.kt:203:5:214:5 | x | LocalVariableDeclExpr |
+| exprs.kt:207:19:207:19 | s | exprs.kt:203:5:214:5 | x | VarAccess |
 | exprs.kt:207:19:207:23 | plus(...) | exprs.kt:203:5:214:5 | x | MethodAccess |
 | exprs.kt:207:23:207:23 | 5 | exprs.kt:203:5:214:5 | x | IntegerLiteral |
 | exprs.kt:208:9:208:29 | b2 | exprs.kt:203:5:214:5 | x | LocalVariableDeclExpr |
