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

Decompiler & stub builder fixed accordingly with new enum syntax.

Browse Source 
Companion object now directly follows enum entries to avoid having them at the middle.
Some decompiler & stub builder tests fixed accordingly.
This commit is contained in:
Mikhail Glukhikh
2015-05-07 18:50:53 +03:00
parent cf741cb868
commit 67cce57aeb
5 changed files with 49 additions and 30 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
+1 -1
View File
@@ -161,8 +161,8 @@ private class ClassClsStubBuilder(
private fun createClassBodyAndMemberStubs() {
val classBody = KotlinPlaceHolderStubImpl<JetClassBody>(classOrObjectStub, JetStubElementTypes.CLASS_BODY)
createCompanionObjectStub(classBody)
createEnumEntryStubs(classBody)
createCompanionObjectStub(classBody)
createCallableMemberStubs(classBody)
createInnerAndNestedClasses(classBody)
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt
+17 -13
View File
@@ -169,13 +169,17 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
builder.append(" {\n")
var firstPassed = false
val subindent = indent + " "
val companionObject = descriptor.getCompanionObjectDescriptor()
if (companionObject != null) {
firstPassed = true
builder.append(subindent)
appendDescriptor(companionObject, subindent)
}
val allDescriptors = descriptor.secondaryConstructors + descriptor.getDefaultType().getMemberScope().getDescriptors()
val companionObject = descriptor.getCompanionObjectDescriptor()
var companionNeeded = (companionObject != null)
fun newlineExceptFirst() {
if (firstPassed) {
builder.append("\n")
}
else {
firstPassed = true
}
}
for (member in allDescriptors) {
if (member.getContainingDeclaration() != descriptor) {
continue
@@ -183,19 +187,19 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
if (member == companionObject) {
continue
}
if (companionNeeded && !isEnumEntry(member)) {
companionNeeded = false
newlineExceptFirst()
builder.append(subindent)
appendDescriptor(companionObject, subindent)
}
if (member is CallableMemberDescriptor
&& member.getKind() != CallableMemberDescriptor.Kind.DECLARATION
//TODO: not synthesized and component like
&& !isComponentLike(member.getName())) {
continue
}
if (firstPassed) {
builder.append("\n")
}
else {
firstPassed = true
}
newlineExceptFirst()
builder.append(subindent)
appendDescriptor(member, subindent)
}
idea/testData/decompiler/decompiledText/Enum.expected.kt
+16 -4
View File
@@ -3,10 +3,22 @@
package test
public final enum class Enum private () : kotlin.Enum<test.Enum>, dependency.Tr {
ONE
internal final enum class Enum private () : kotlin.Enum<test.Enum> {
A
TWO
B
THREE
C
D
E
F
internal companion object {
internal final val c: kotlin.Int /* compiled code */
}
internal open fun f(): kotlin.Int { /* compiled code */ }
}
idea/testData/decompiler/decompiledText/Enum/Enum.kt
+9 -6
View File
@@ -2,11 +2,14 @@ package test
import dependency.*
public enum class Enum : Tr {
ONE
TWO
THREE {
fun g() {
}
enum class Enum {
A B C D E F {
override fun f() = 4
}
companion object {
val c: Int = 1
}
open fun f() = 3
}
idea/testData/decompiler/stubBuilder/Enum/Enum.txt
+6 -6
View File
@@ -37,6 +37,12 @@ PsiJetFileStubImpl[package=a.b.c.test.enum]
REFERENCE_EXPRESSION:[referencedName=enum]
REFERENCE_EXPRESSION:[referencedName=Enum]
CLASS_BODY:
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.A, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]]
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.B, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]]
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.C, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]]
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.D, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]]
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.E, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E, superNames=[]]
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.F, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=F, superNames=[]]
OBJECT_DECLARATION:[fqName=a.b.c.test.enum.Enum.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]]
MODIFIER_LIST:[internal companion]
CLASS_BODY:
@@ -47,12 +53,6 @@ PsiJetFileStubImpl[package=a.b.c.test.enum]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=Int]
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.A, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]]
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.B, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]]
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.C, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]]
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.D, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]]
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.E, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E, superNames=[]]
ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.F, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=F, superNames=[]]
FUN:[fqName=a.b.c.test.enum.Enum.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f]
MODIFIER_LIST:[open internal]
VALUE_PARAMETER_LIST: