return primary constructor in declarations for KSClassDeclarationImpl

PR #275 made different class declaration backends more consistent
by adding constructor into declarations and making getConstructors
return based on that.
Unfortunately, it missed primary constructor, causing missing
constructors to be returned OR even worse, return an empty constructor
instead of the primary constructor.

This PR fixes that issue and also extends the test case to
cover it.

Fixes: #279

Author: yigit

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassDeclarationImpl.kt

@@ -60,8 +60,13 @@ class KSClassDeclarationImpl private constructor(val ktClassOrObject: KtClassOrO
         val propertiesFromConstructor = primaryConstructor?.parameters
             ?.filter { it.isVar || it.isVal }
             ?.map { KSPropertyDeclarationParameterImpl.getCached((it as KSValueParameterImpl).ktParameter) } ?: emptyList()
-        val result = ktClassOrObject.declarations.getKSDeclarations().toMutableList()
+        val result = ktClassOrObject.declarations.getKSDeclarations().toMutableList<KSDeclaration>()
         result.addAll(propertiesFromConstructor)
+        primaryConstructor?.let { primaryConstructor: KSDeclaration ->
+            if (!result.contains(primaryConstructor)) {
+                result.add(primaryConstructor)
+            }
+        }
         if (classKind != ClassKind.INTERFACE) {
             // check if we need to add a synthetic constructor
             val hasConstructor = result.any {

compiler-plugin/testData/api/constructorDeclarations.kt

@@ -54,10 +54,32 @@
 // <init>(): lib.AbstractKotlinClassWithMultipleConstructors1
 // <init>(kotlin.Int): lib.AbstractKotlinClassWithMultipleConstructors1
 // <init>(kotlin.String): lib.AbstractKotlinClassWithMultipleConstructors1
+// class: AbstractKotlinClassWithMultipleConstructors2
+// <init>(kotlin.Float): AbstractKotlinClassWithMultipleConstructors2
+// <init>(kotlin.Int): AbstractKotlinClassWithMultipleConstructors2
+// <init>(kotlin.String): AbstractKotlinClassWithMultipleConstructors2
+// class: lib.AbstractKotlinClassWithMultipleConstructors2
+// <init>(kotlin.Float): lib.AbstractKotlinClassWithMultipleConstructors2
+// <init>(kotlin.Int): lib.AbstractKotlinClassWithMultipleConstructors2
+// <init>(kotlin.String): lib.AbstractKotlinClassWithMultipleConstructors2
+// class: AbstractKotlinClassWithPrimaryConstructor
+// <init>(kotlin.Int): AbstractKotlinClassWithPrimaryConstructor
+// class: lib.AbstractKotlinClassWithPrimaryConstructor
+// <init>(kotlin.Int): lib.AbstractKotlinClassWithPrimaryConstructor
 // class: AbstractKotlinClassWithoutExplicitConstructor
 // <init>(): AbstractKotlinClassWithoutExplicitConstructor
 // class: lib.AbstractKotlinClassWithoutExplicitConstructor
 // <init>(): lib.AbstractKotlinClassWithoutExplicitConstructor
+// class: DataClass
+// <init>(kotlin.Int,kotlin.String): DataClass
+// class: lib.DataClass
+// <init>(kotlin.Int,kotlin.String): lib.DataClass
+// class: DataClassWithSecondaryConstructor
+// <init>(kotlin.Int): DataClassWithSecondaryConstructor
+// <init>(kotlin.Int,kotlin.String): DataClassWithSecondaryConstructor
+// class: lib.DataClassWithSecondaryConstructor
+// <init>(kotlin.Int): lib.DataClassWithSecondaryConstructor
+// <init>(kotlin.Int,kotlin.String): lib.DataClassWithSecondaryConstructor
 // class: JavaAnnotation
 // <init>(): JavaAnnotation
 // class: lib.JavaAnnotation
@@ -108,10 +130,22 @@
 // <init>(): lib.KotlinClassWithMultipleConstructors1
 // <init>(kotlin.Int): lib.KotlinClassWithMultipleConstructors1
 // <init>(kotlin.String): lib.KotlinClassWithMultipleConstructors1
+// class: KotlinClassWithMultipleConstructors2
+// <init>(kotlin.Float): KotlinClassWithMultipleConstructors2
+// <init>(kotlin.Int): KotlinClassWithMultipleConstructors2
+// <init>(kotlin.String): KotlinClassWithMultipleConstructors2
+// class: lib.KotlinClassWithMultipleConstructors2
+// <init>(kotlin.Float): lib.KotlinClassWithMultipleConstructors2
+// <init>(kotlin.Int): lib.KotlinClassWithMultipleConstructors2
+// <init>(kotlin.String): lib.KotlinClassWithMultipleConstructors2
 // class: KotlinClassWithNamedCompanion
 // <init>(): KotlinClassWithNamedCompanion
 // class: lib.KotlinClassWithNamedCompanion
 // <init>(): lib.KotlinClassWithNamedCompanion
+// class: KotlinClassWithPrimaryConstructor
+// <init>(kotlin.Int): KotlinClassWithPrimaryConstructor
+// class: lib.KotlinClassWithPrimaryConstructor
+// <init>(kotlin.Int): lib.KotlinClassWithPrimaryConstructor
 // class: KotlinClassWithoutExplicitConstructor
 // <init>(): KotlinClassWithoutExplicitConstructor
 // class: lib.KotlinClassWithoutExplicitConstructor
@@ -181,6 +215,8 @@ interface KotlinInterface {}
 class KotlinClassWithoutExplicitConstructor {
 }
 class KotlinClassWithExplicitEmptyConstructor() {}
+class KotlinClassWithPrimaryConstructor(x:Int) {
+}
 class KotlinClassWithExplicitConstructor {
     constructor(x:Int) {}
 }
@@ -189,8 +225,14 @@ class KotlinClassWithMultipleConstructors1 {
     constructor(y:Int): this() {}
     constructor(x: String) : this() {}
 }
+class KotlinClassWithMultipleConstructors2(z:Float) {
+    constructor(y:Int): this(0f) {}
+    constructor(x: String) : this(0f) {}
+}
 abstract class AbstractKotlinClassWithoutExplicitConstructor {
 }
+abstract class AbstractKotlinClassWithPrimaryConstructor(x:Int) {
+}
 abstract class AbstractKotlinClassWithExplicitEmptyConstructor() {}
 abstract class AbstractKotlinClassWithExplicitConstructor {
     constructor(x:Int) {}
@@ -200,6 +242,10 @@ abstract class AbstractKotlinClassWithMultipleConstructors1 {
     constructor(y:Int): this() {}
     constructor(x: String) : this() {}
 }
+abstract class AbstractKotlinClassWithMultipleConstructors2(z:Float) {
+    constructor(y:Int): this(0f) {}
+    constructor(x: String) : this(0f) {}
+}
 annotation class KotlinAnnotation
 object KotlinObject {}
 class KotlinClassWithCompanion {
@@ -208,6 +254,10 @@ class KotlinClassWithCompanion {
 class KotlinClassWithNamedCompanion {
     companion object MyCompanion
 }
+data class DataClass(val x:Int, var y:String)
+data class DataClassWithSecondaryConstructor(val x:Int, val y:String) {
+    constructor(x:Int) : this(x, "")
+}
 // MODULE: main(lib)
 // FILE: JavaInterface.java
 interface JavaInterface {
@@ -254,6 +304,8 @@ interface KotlinInterface {}
 class KotlinClassWithoutExplicitConstructor {
 }
 class KotlinClassWithExplicitEmptyConstructor() {}
+class KotlinClassWithPrimaryConstructor(x:Int) {
+}
 class KotlinClassWithExplicitConstructor {
     constructor(x:Int) {}
 }
@@ -262,8 +314,14 @@ class KotlinClassWithMultipleConstructors1 {
     constructor(y:Int): this() {}
     constructor(x: String) : this() {}
 }
+class KotlinClassWithMultipleConstructors2(z:Float) {
+    constructor(y:Int): this(0f) {}
+    constructor(x: String) : this(0f) {}
+}
 abstract class AbstractKotlinClassWithoutExplicitConstructor {
 }
+abstract class AbstractKotlinClassWithPrimaryConstructor(x:Int) {
+}
 abstract class AbstractKotlinClassWithExplicitEmptyConstructor() {}
 abstract class AbstractKotlinClassWithExplicitConstructor {
     constructor(x:Int) {}
@@ -273,11 +331,19 @@ abstract class AbstractKotlinClassWithMultipleConstructors1 {
     constructor(y:Int): this() {}
     constructor(x: String) : this() {}
 }
+abstract class AbstractKotlinClassWithMultipleConstructors2(z:Float) {
+    constructor(y:Int): this(0f) {}
+    constructor(x: String) : this(0f) {}
+}
 annotation class KotlinAnnotation
 object KotlinObject {}
 class KotlinClassWithCompanion {
     companion object
 }
 class KotlinClassWithNamedCompanion {
     companion object MyCompanion
+}
+data class DataClass(val x:Int, var y:String)
+data class DataClassWithSecondaryConstructor(val x:Int, val y:String) {
+    constructor(x:Int) : this(x, "")
 }