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

Fix cls builder for new decompiler

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-06 15:41:30 +03:00
parent 59f192ef90
commit b51368a5e5
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl;
import java.io.IOException; import java.io.IOException;
public class JetFileElementType extends IStubFileElementType<KotlinFileStub> { public class JetFileElementType extends IStubFileElementType<KotlinFileStub> {
public static final int STUB_VERSION = 37; public static final int STUB_VERSION = 38;
private static final String NAME = "kotlin.FILE"; private static final String NAME = "kotlin.FILE";
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+1
View File
@@ -94,6 +94,7 @@ private class ClassClsStubBuilder(
val additionalModifiers = when (classKind) { val additionalModifiers = when (classKind) {
ProtoBuf.Class.Kind.ENUM_CLASS -> listOf(JetTokens.ENUM_KEYWORD) ProtoBuf.Class.Kind.ENUM_CLASS -> listOf(JetTokens.ENUM_KEYWORD)
ProtoBuf.Class.Kind.ANNOTATION_CLASS -> listOf(JetTokens.ANNOTATION_KEYWORD) ProtoBuf.Class.Kind.ANNOTATION_CLASS -> listOf(JetTokens.ANNOTATION_KEYWORD)
ProtoBuf.Class.Kind.CLASS_OBJECT -> listOf(JetTokens.DEFAULT_KEYWORD)
else -> listOf<JetModifierKeywordToken>() else -> listOf<JetModifierKeywordToken>()
} }
return createModifierListStubForDeclaration(parent, classProto.getFlags(), relevantFlags, additionalModifiers) return createModifierListStubForDeclaration(parent, classProto.getFlags(), relevantFlags, additionalModifiers)
idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
+1 -1
View File
@@ -34,7 +34,7 @@ PsiJetFileStubImpl[package=]
REFERENCE_EXPRESSION:[referencedName=Int] REFERENCE_EXPRESSION:[referencedName=Int]
CLASS_BODY: CLASS_BODY:
OBJECT_DECLARATION:[fqName=Annotations.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] OBJECT_DECLARATION:[fqName=Annotations.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]]
MODIFIER_LIST:[private] MODIFIER_LIST:[private default]
ANNOTATION_ENTRY:[hasValueArguments=false, shortName=b] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=b]
CONSTRUCTOR_CALLEE: CONSTRUCTOR_CALLEE:
TYPE_REFERENCE: TYPE_REFERENCE:
idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt
+4 -4
View File
@@ -8,7 +8,7 @@ PsiJetFileStubImpl[package=test.class_object]
VALUE_PARAMETER_LIST: VALUE_PARAMETER_LIST:
CLASS_BODY: CLASS_BODY:
OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]]
MODIFIER_LIST:[public] MODIFIER_LIST:[public default]
CLASS_BODY: CLASS_BODY:
PROPERTY:[fqName=test.class_object.ClassObject.Default.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=j] PROPERTY:[fqName=test.class_object.ClassObject.Default.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=j]
MODIFIER_LIST:[internal final] MODIFIER_LIST:[internal final]
@@ -68,21 +68,21 @@ PsiJetFileStubImpl[package=test.class_object]
VALUE_PARAMETER_LIST: VALUE_PARAMETER_LIST:
CLASS_BODY: CLASS_BODY:
OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]]
MODIFIER_LIST:[internal] MODIFIER_LIST:[internal default]
CLASS_BODY: CLASS_BODY:
CLASS:[fqName=test.class_object.ClassObject.B.Default.C, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=C, superNames=[]] CLASS:[fqName=test.class_object.ClassObject.B.Default.C, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=C, superNames=[]]
MODIFIER_LIST:[internal final] MODIFIER_LIST:[internal final]
VALUE_PARAMETER_LIST: VALUE_PARAMETER_LIST:
CLASS_BODY: CLASS_BODY:
OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default.C.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default.C.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]]
MODIFIER_LIST:[internal] MODIFIER_LIST:[internal default]
CLASS_BODY: CLASS_BODY:
CLASS:[fqName=test.class_object.ClassObject.B.Default.C.Default.D, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=D, superNames=[]] CLASS:[fqName=test.class_object.ClassObject.B.Default.C.Default.D, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=D, superNames=[]]
MODIFIER_LIST:[internal final] MODIFIER_LIST:[internal final]
VALUE_PARAMETER_LIST: VALUE_PARAMETER_LIST:
CLASS_BODY: CLASS_BODY:
OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]]
MODIFIER_LIST:[internal] MODIFIER_LIST:[internal default]
CLASS_BODY: CLASS_BODY:
PROPERTY:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=i] PROPERTY:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=i]
MODIFIER_LIST:[internal final] MODIFIER_LIST:[internal final]
idea/testData/decompiler/stubBuilder/Enum/Enum.txt
+1 -1
View File
@@ -36,7 +36,7 @@ PsiJetFileStubImpl[package=a.b.c.test.enum]
REFERENCE_EXPRESSION:[referencedName=Enum] REFERENCE_EXPRESSION:[referencedName=Enum]
CLASS_BODY: CLASS_BODY:
OBJECT_DECLARATION:[fqName=a.b.c.test.enum.Enum.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] OBJECT_DECLARATION:[fqName=a.b.c.test.enum.Enum.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]]
MODIFIER_LIST:[internal] MODIFIER_LIST:[internal default]
CLASS_BODY: CLASS_BODY:
PROPERTY:[fqName=a.b.c.test.enum.Enum.Default.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=c] PROPERTY:[fqName=a.b.c.test.enum.Enum.Default.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=c]
MODIFIER_LIST:[internal final] MODIFIER_LIST:[internal final]