Support secondary constructors in decompiled text

Build cls stubs for secondary constructors

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt

@@ -16,19 +16,23 @@
 
 package org.jetbrains.kotlin.idea.decompiler.stubBuilder
 
-import com.intellij.psi.stubs.StubElement
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf.Modality
+import com.intellij.psi.stubs.StubElement
+import org.jetbrains.kotlin.idea.decompiler.stubBuilder.FlagsToModifiers.MODALITY
+import org.jetbrains.kotlin.idea.decompiler.stubBuilder.FlagsToModifiers.VISIBILITY
+import org.jetbrains.kotlin.psi.JetSecondaryConstructor
+import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinFunctionStubImpl
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinPropertyStubImpl
-import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
-import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.MemberKind
 import org.jetbrains.kotlin.resolve.dataClassUtils.isComponentLike
+import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.MemberKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.Modality
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
-import org.jetbrains.kotlin.idea.decompiler.stubBuilder.FlagsToModifiers.*
+import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 
 fun createCallableStub(
         parentStub: StubElement<out PsiElement>,
@@ -60,11 +64,14 @@ private class CallableClsStubBuilder(
     private val c = outerContext.child(callableProto.getTypeParameterList())
     private val typeStubBuilder = TypeClsStubBuilder(c)
     private val isTopLevel: Boolean get() = protoContainer.packageFqName != null
+    private val callableKind = Flags.CALLABLE_KIND[callableProto.getFlags()]
+    private val isConstructor = callableKind == ProtoBuf.Callable.CallableKind.CONSTRUCTOR
     private val callableStub = doCreateCallableStub()
 
     fun build() {
         createModifierListStub()
-        val typeConstraintListData = typeStubBuilder.createTypeParameterListStub(callableStub, callableProto.getTypeParameterList())
+        val typeParameterList = if (isConstructor) emptyList() else callableProto.getTypeParameterList()
+        val typeConstraintListData = typeStubBuilder.createTypeParameterListStub(callableStub, typeParameterList)
         createReceiverTypeReferenceStub()
         createValueParameterList()
         createReturnTypeStub()
@@ -82,11 +89,13 @@ private class CallableClsStubBuilder(
     }
 
     private fun createReturnTypeStub() {
-        typeStubBuilder.createTypeReferenceStub(callableStub, callableProto.getReturnType())
+        if (!isConstructor)
+            typeStubBuilder.createTypeReferenceStub(callableStub, callableProto.getReturnType())
     }
 
     private fun createModifierListStub() {
-        val relevantModifiers = if (isTopLevel) listOf(VISIBILITY) else listOf(VISIBILITY, MODALITY)
+        val isModalityIrrelevant = isTopLevel || isConstructor
+        val relevantModifiers = if (isModalityIrrelevant) listOf(VISIBILITY) else listOf(VISIBILITY, MODALITY)
 
         val modifierListStubImpl = createModifierListStubForDeclaration(callableStub, callableProto.getFlags(), relevantModifiers)
         val annotationIds = c.components.annotationLoader.loadCallableAnnotations(
@@ -96,9 +105,7 @@ private class CallableClsStubBuilder(
     }
 
     private fun doCreateCallableStub(): StubElement<out PsiElement> {
-        val callableKind = Flags.CALLABLE_KIND[callableProto.getFlags()]
         val callableName = c.nameResolver.getName(callableProto.getName())
-        val callableFqName = c.containerFqName.child(callableName)
 
         return when (callableKind) {
             ProtoBuf.Callable.CallableKind.FUN -> {
@@ -106,7 +113,7 @@ private class CallableClsStubBuilder(
                         parent,
                         callableName.ref(),
                         isTopLevel,
-                        callableFqName,
+                        c.containerFqName.child(callableName),
                         isExtension = callableProto.hasReceiverType(),
                         hasBlockBody = true,
                         hasBody = Flags.MODALITY[callableProto.getFlags()] != Modality.ABSTRACT,
@@ -125,11 +132,13 @@ private class CallableClsStubBuilder(
                         hasInitializer = false,
                         hasReceiverTypeRef = callableProto.hasReceiverType(),
                         hasReturnTypeRef = true,
-                        fqName = callableFqName,
+                        fqName = c.containerFqName.child(callableName),
                         isProbablyNothingType = isProbablyNothing(callableProto)
                 )
             }
-            ProtoBuf.Callable.CallableKind.CONSTRUCTOR -> throw IllegalStateException("Should not be called for constructor!")
+            ProtoBuf.Callable.CallableKind.CONSTRUCTOR -> {
+                KotlinPlaceHolderStubImpl<JetSecondaryConstructor>(parent, JetStubElementTypes.SECONDARY_CONSTRUCTOR)
+            }
             else -> throw IllegalStateException("Unknown callable kind $callableKind")
         }
     }

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt

@@ -135,7 +135,7 @@ private class ClassClsStubBuilder(
     }
 
     private fun createConstructorStub() {
-        if (!isClass()) return
+        if (!isClass() || !classProto.hasPrimaryConstructor()) return
 
         val primaryConstructorProto = classProto.getPrimaryConstructor()
         if (primaryConstructorProto.hasData()) {
@@ -198,7 +198,8 @@ private class ClassClsStubBuilder(
 
     private fun createCallableMemberStubs(classBody: KotlinPlaceHolderStubImpl<JetClassBody>) {
         val container = ProtoContainer(classProto, null)
-        for (callableProto in classProto.getMemberList()) {
+        val allMembers = classProto.getSecondaryConstructorList() + classProto.getMemberList()
+        for (callableProto in allMembers) {
             createCallableStub(classBody, callableProto, c, container)
         }
     }

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt

@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.types.isFlexible
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind
 import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind
+import org.jetbrains.kotlin.resolve.descriptorUtil.secondaryConstructors
 import org.jetbrains.kotlin.types.flexibility
 
 private val FILE_ABI_VERSION_MARKER: String = "FILE_ABI"
@@ -85,6 +86,7 @@ private val descriptorRendererForDecompiler = DescriptorRendererBuilder()
             else type
 
         }
+        .setSecondaryConstructorsAsPrimary(false)
         .build()
 
 private val descriptorRendererForKeys = DescriptorRenderer.COMPACT_WITH_MODIFIERS
@@ -153,7 +155,8 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
                     builder.append(subindent)
                     appendDescriptor(defaultObject, subindent)
                 }
-                for (member in descriptor.getDefaultType().getMemberScope().getDescriptors()) {
+                val allDescriptors = descriptor.secondaryConstructors + descriptor.getDefaultType().getMemberScope().getDescriptors()
+                for (member in allDescriptors) {
                     if (member.getContainingDeclaration() != descriptor) {
                         continue
                     }