Fix Java class constructor calculation.

* Add support for default constructor of Java class. * Fixed getDeclaredFunctions which will return duplicate elements for all constructors.
google · Oct 2, 2020 · 6ee0964 · 6ee0964
1 parent 6c45a3b
commit 6ee0964
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
diff --git a/api/src/main/kotlin/com/google/devtools/ksp/utils.kt b/api/src/main/kotlin/com/google/devtools/ksp/utils.kt
@@ -64,7 +64,8 @@ fun KSClassDeclaration.getDeclaredProperties(): List<KSPropertyDeclaration> {
 }
 
 fun KSClassDeclaration.getConstructors(): List<KSFunctionDeclaration> {
-    return this.getDeclaredFunctions().filter { it.simpleName.asString() == this.simpleName.asString() }
+    val functions = if (this.origin == Origin.JAVA) this.getAllFunctions() else this.getDeclaredFunctions()
+    return functions.filter { it.simpleName.asString() == this.simpleName.asString() || it.simpleName.asString() == "<init>"}
             .let { constructors ->
                 this.primaryConstructor?.let { constructors.plus(it) } ?: constructors
             }

diff --git a/...iler-plugin/src/main/kotlin/com/google/devtools/ksp/processor/ImplicitElementProcessor.kt b/...iler-plugin/src/main/kotlin/com/google/devtools/ksp/processor/ImplicitElementProcessor.kt
@@ -21,6 +21,7 @@ package com.google.devtools.ksp.processor
 import com.google.devtools.ksp.findAnnotationFromUseSiteTarget
 import com.google.devtools.ksp.getClassDeclarationByName
 import com.google.devtools.ksp.getConstructors
+import com.google.devtools.ksp.getDeclaredFunctions
 import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.symbol.KSDeclaration
 import com.google.devtools.ksp.symbol.KSPropertyDeclaration
@@ -40,7 +41,9 @@ class ImplicitElementProcessor : AbstractTestProcessor() {
         result.add(ClsClass.getConstructors().map { it.toString() }.joinToString(","))
         val ITF = resolver.getClassDeclarationByName(resolver.getKSNameFromString("ITF"))!!
         result.add(ITF.primaryConstructor?.simpleName?.asString() ?: "<null>")
-        result.add(resolver.getClassDeclarationByName(resolver.getKSNameFromString("JavaClass"))!!.primaryConstructor?.simpleName?.asString() ?: "<null>")
+        val JavaClass = resolver.getClassDeclarationByName("JavaClass")!!
+        result.add(JavaClass.primaryConstructor?.simpleName?.asString() ?: "<null>")
+        result.add(JavaClass.getDeclaredFunctions().map { it.simpleName.asString() }.joinToString(","))
         val readOnly = ClsClass.declarations.single { it.simpleName.asString() == "readOnly" } as KSPropertyDeclaration
         readOnly.getter?.let { result.add("readOnly.get(): ${it.origin} annotations from property: ${it.findAnnotationFromUseSiteTarget().map { it.shortName.asString() }.joinToString(",")}") }
         readOnly.getter?.receiver?.let { result.add("readOnly.getter.owner: " + nameAndOrigin(it)) }
@@ -61,5 +64,7 @@ class ImplicitElementProcessor : AbstractTestProcessor() {
         result.add(annotationType)
         val ClassWithoutImplicitPrimaryConstructor = resolver.getClassDeclarationByName("ClassWithoutImplicitPrimaryConstructor")!!
         result.add(ClassWithoutImplicitPrimaryConstructor.getConstructors().map { it.toString() }.joinToString(","))
+        val ImplictConstructorJava = resolver.getClassDeclarationByName("ImplictConstructorJava")!!
+        result.add(ImplictConstructorJava.getConstructors().map { it.toString() }.joinToString(","))
     }
 }
diff --git a/...in/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt b/...in/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt
@@ -78,6 +78,7 @@ class KSClassDeclarationJavaImpl private constructor(val psi: PsiClass) : KSClas
             it.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS)
                 .toList()
                 .filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+                .plus(it.constructors)
                 .map { (it as FunctionDescriptor).toKSFunctionDeclaration() }
         } ?: emptyList()
     }
@@ -92,10 +93,11 @@ class KSClassDeclarationJavaImpl private constructor(val psi: PsiClass) : KSClas
     }
 
     override val declarations: List<KSDeclaration> by lazy {
-        psi.fields.map { KSPropertyDeclarationJavaImpl.getCached(it) } +
+        (psi.fields.map { KSPropertyDeclarationJavaImpl.getCached(it) } +
                 psi.innerClasses.map { KSClassDeclarationJavaImpl.getCached(it) } +
                 psi.constructors.map { KSFunctionDeclarationJavaImpl.getCached(it) } +
-                psi.methods.map { KSFunctionDeclarationJavaImpl.getCached(it) }
+                psi.methods.map { KSFunctionDeclarationJavaImpl.getCached(it) })
+                .distinct()
     }
 
     override val modifiers: Set<Modifier> by lazy {

diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/utils.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/utils.kt
@@ -32,8 +32,10 @@ import com.google.devtools.ksp.symbol.impl.java.KSFunctionDeclarationJavaImpl
 import com.google.devtools.ksp.symbol.impl.java.KSPropertyDeclarationJavaImpl
 import com.google.devtools.ksp.symbol.impl.java.KSTypeArgumentJavaImpl
 import com.google.devtools.ksp.symbol.impl.kotlin.*
+import com.intellij.psi.impl.source.PsiClassImpl
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.load.java.JavaVisibilities
+import org.jetbrains.kotlin.load.java.descriptors.JavaClassConstructorDescriptor
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 import org.jetbrains.kotlin.resolve.source.getPsi
@@ -254,6 +256,10 @@ internal fun KotlinType.replaceTypeArguments(newArguments: List<KSTypeArgument>)
 internal fun FunctionDescriptor.toKSFunctionDeclaration(): KSFunctionDeclaration {
     if (this.kind != CallableMemberDescriptor.Kind.DECLARATION) return KSFunctionDeclarationDescriptorImpl.getCached(this)
     val psi = this.findPsi() ?: return KSFunctionDeclarationDescriptorImpl.getCached(this)
+    // Java default constructor has a kind DECLARATION of while still being synthetic.
+    if (psi is PsiClassImpl && this is JavaClassConstructorDescriptor) {
+        return KSFunctionDeclarationDescriptorImpl.getCached(this)
+    }
     return when (psi) {
         is KtFunction -> KSFunctionDeclarationImpl.getCached(psi)
         is PsiMethod -> KSFunctionDeclarationJavaImpl.getCached(psi)

diff --git a/compiler-plugin/testData/api/allFunctions.kt b/compiler-plugin/testData/api/allFunctions.kt
@@ -19,6 +19,7 @@
 // TEST PROCESSOR: AllFunctionsProcessor
 // EXPECTED:
 // class: Foo
+// <init>(): C
 // a
 // aFromC
 // aFromC

diff --git a/compiler-plugin/testData/api/implicitElements.kt b/compiler-plugin/testData/api/implicitElements.kt
@@ -21,6 +21,7 @@
 // synthetic constructor for Cls
 // <null>
 // <null>
+// JavaClass,JavaClass,JavaClass
 // readOnly.get(): SYNTHETIC annotations from property: GetAnno
 // readOnly.getter.owner: readOnly: KOTLIN
 // readWrite.get(): KOTLIN
@@ -31,6 +32,7 @@
 // comp2.set(): SYNTHETIC
 // GetAnno
 // ClassWithoutImplicitPrimaryConstructor
+// <init>
 // END
 // FILE: a.kt
 annotation class GetAnno
@@ -59,3 +61,9 @@ public class JavaClass {
     public JavaClass(int a) { this(a, "ok"); }
     public JavaClass(int a, String s) { }
 }
+
+// FILE:ImplictConstructorJava.java
+
+public class ImplictConstructorJava {
+
+}