azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prepare to retire Type.Constructor message in descriptors.proto after M13

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-07-24 13:38:58 +03:00
parent b3659486d9
commit 2e18b3de9d
4 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+5 -3
View File
@@ -36,8 +36,9 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl
import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.ProtoBuf.Type
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
import org.jetbrains.kotlin.serialization.deserialization.TypeConstructorKind
import org.jetbrains.kotlin.serialization.deserialization.getTypeConstructorData
fun createClassStub(parent: StubElement<out PsiElement>, classProto: ProtoBuf.Class, classId: ClassId, context: ClsStubBuilderContext) {
@@ -55,8 +56,9 @@ private class ClassClsStubBuilder(
private val classKind = Flags.CLASS_KIND[classProto.getFlags()]
private val supertypeIds = classProto.getSupertypeList().map {
type ->
assert(type.getConstructor().getKind() == Type.Constructor.Kind.CLASS)
c.nameResolver.getClassId(type.getConstructor().getId())
val typeConstructorData = type.getTypeConstructorData()
assert(typeConstructorData.kind == TypeConstructorKind.CLASS)
c.nameResolver.getClassId(typeConstructorData.id)
}.let {
supertypeIds ->
//empty supertype list if single supertype is Any
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+11 -8
View File
@@ -36,6 +36,8 @@ import org.jetbrains.kotlin.serialization.ProtoBuf.Type
import org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection
import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
import org.jetbrains.kotlin.serialization.deserialization.TypeConstructorKind
import org.jetbrains.kotlin.serialization.deserialization.getTypeConstructorData
import org.jetbrains.kotlin.types.DynamicTypeCapabilities
import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
import java.util.ArrayList
@@ -54,13 +56,14 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
if (type.getNullable()) KotlinPlaceHolderStubImpl<JetNullableType>(typeReference, JetStubElementTypes.NULLABLE_TYPE)
else typeReference
when (type.getConstructor().getKind()) {
Type.Constructor.Kind.CLASS -> {
val typeConstructorData = type.getTypeConstructorData()
when (typeConstructorData.kind) {
TypeConstructorKind.CLASS -> {
createClassReferenceTypeStub(effectiveParent, type, annotations)
}
Type.Constructor.Kind.TYPE_PARAMETER -> {
TypeConstructorKind.TYPE_PARAMETER -> {
createTypeAnnotationStubs(effectiveParent, annotations)
val typeParameterName = c.typeParameters[type.getConstructor().getId()]
val typeParameterName = c.typeParameters[typeConstructorData.id]
createStubForTypeName(ClassId.topLevel(FqName.topLevel(typeParameterName)), effectiveParent)
}
}
@@ -237,11 +240,11 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
}
private fun Type.isDefaultUpperBound(): Boolean {
val constructor = getConstructor()
if (constructor.getKind() != Type.Constructor.Kind.CLASS) {
val typeConstructorData = getTypeConstructorData()
if (typeConstructorData.kind != TypeConstructorKind.CLASS) {
return false
}
val classId = c.nameResolver.getClassId(constructor.getId())
return KotlinBuiltIns.isAny(classId.asSingleFqName().toUnsafe()) && this.getNullable()
val classId = c.nameResolver.getClassId(typeConstructorData.id)
return KotlinBuiltIns.isAny(classId.asSingleFqName().toUnsafe()) && this.nullable
}
}