Merge pull request #9280 from tamasvajk/kotlin-map-kj-properties

Kotlin: Fix missing kotlin to java property mapping

java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt

@@ -6,6 +6,7 @@ import com.semmle.extractor.java.OdasaOutput
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.ir.allOverridden
 import org.jetbrains.kotlin.backend.common.lower.parentsWithSelf
+import org.jetbrains.kotlin.backend.jvm.ir.propertyIfAccessor
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.declarations.*
@@ -960,7 +961,19 @@ open class KotlinUsesExtractor(
                             decl.name == f.name &&
                             decl.valueParameters.size == f.valueParameters.size
                         } ?:
-                        run {
+                        // Or check property accessors:
+                        if (f.isAccessor) {
+                            val prop = javaClass.declarations.filterIsInstance<IrProperty>().find { decl ->
+                                decl.name == (f.propertyIfAccessor as IrProperty).name
+                            }
+                            if (prop?.getter?.name == f.name)
+                                prop.getter
+                            else if (prop?.setter?.name == f.name)
+                                prop.setter
+                            else null
+                        } else {
+                            null
+                        } ?: run {
                             val parentFqName = parentClass.fqNameWhenAvailable?.asString()
                             if (!expectedMissingEquivalents.contains(parentFqName)) {
                                 logger.warn("Couldn't find a Java equivalent function to $parentFqName.${f.name} in ${javaClass.fqNameWhenAvailable}")

java/ql/test/kotlin/library-tests/java-map-methods/test.expected

@@ -1,2 +1,4 @@
+diagnostics
+#select
 | Integer |
 | Object |

java/ql/test/kotlin/library-tests/java-map-methods/test.kt

@@ -1 +1,3 @@
 fun test(m: Map<Int, Int>) = m.getOrDefault(1, 2)
+
+fun test2(s: String) = s.length

java/ql/test/kotlin/library-tests/java-map-methods/test.ql

@@ -1,4 +1,7 @@
 import java
+import semmle.code.java.Diagnostics
 
 from MethodAccess ma
 select ma.getCallee().getAParameter().getType().toString()
+
+query predicate diagnostics(Diagnostic d) { any() }