Fix resolveJavaDeclaration for get/set methods

This PR fixes a bug where KSP failed to resolve the java declaration for a java method if its name starts with get or set. Fixes: #200 Test: signatureMapper
google · Dec 22, 2020 · 03de9f1 · 03de9f1
1 parent 91d9d18
commit 03de9f1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/ResolverImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/ResolverImpl.kt
@@ -329,22 +329,21 @@ class ResolverImpl(
             is PsiClass -> moduleClassResolver.resolveClass(JavaClassImpl(psi))
             is PsiMethod -> {
                 // TODO: get rid of hardcoded check if possible.
-                if (psi.name.startsWith("set") || psi.name.startsWith("get")) {
+                val property = if (psi.name.startsWith("set") || psi.name.startsWith("get")) {
                     moduleClassResolver
                         .resolveClass(JavaMethodImpl(psi).containingClass)
                         ?.findEnclosedDescriptor(
                             kindFilter = DescriptorKindFilter.CALLABLES
                         ) {
                             (it as? PropertyDescriptor)?.getter?.findPsi() == psi || (it as? PropertyDescriptor)?.setter?.findPsi() == psi
                         }
-                } else {
-                    moduleClassResolver
-                        .resolveClass(JavaMethodImpl(psi).containingClass)
-                        ?.findEnclosedDescriptor(
-                            kindFilter = DescriptorKindFilter.FUNCTIONS,
-                            filter = { it.findPsi() == psi }
-                        )
-                }
+                } else null
+                property ?: moduleClassResolver
+                    .resolveClass(JavaMethodImpl(psi).containingClass)
+                    ?.findEnclosedDescriptor(
+                        kindFilter = DescriptorKindFilter.FUNCTIONS,
+                        filter = { it.findPsi() == psi }
+                    )
             }
             is PsiField -> {
                 moduleClassResolver

diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processor/MapSignatureProcessor.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processor/MapSignatureProcessor.kt
@@ -36,6 +36,14 @@ class MapSignatureProcessor : AbstractTestProcessor() {
         result.add(resolver.mapToJvmSignature(cls))
         cls.primaryConstructor?.let { result.add(resolver.mapToJvmSignature(it)) }
         cls.declarations.map { result.add(resolver.mapToJvmSignature(it)) }
+        listOf("Cls", "JavaIntefaceWithVoid")
+            .map { className ->
+                resolver.getClassDeclarationByName(className)!!
+            }.forEach { subject ->
+                result.add(resolver.mapToJvmSignature(subject))
+                subject.primaryConstructor?.let { result.add(resolver.mapToJvmSignature(it)) }
+                subject.declarations.map { result.add(resolver.mapToJvmSignature(it)) }
+            }
         return emptyList()
     }
 }
diff --git a/compiler-plugin/testData/api/signatureMapper.kt b/compiler-plugin/testData/api/signatureMapper.kt
@@ -21,10 +21,18 @@
 // ()V
 // I
 // ()Ljava/lang/String;
+// LJavaIntefaceWithVoid;
+// ()Ljava/lang/Void;
 // END
 
+// FILE: Cls.kt
 class Cls {
     val a: Int = 1
 
     fun foo(): String { return "1" }
 }
+
+// FILE: JavaIntefaceWithVoid.java
+interface JavaIntefaceWithVoid {
+    Void getVoid();
+}