diff --git a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt index b95ed36e1ce..51558c9c2cb 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt @@ -15,7 +15,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=JavaClass] CLASS_BODY: PROPERTY:[fqName=test.AnnotatedFlexibleTypes.bar, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=bar] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] @@ -29,14 +29,14 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.AnnotatedFlexibleTypes.javaClass, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=javaClass] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=d] REFERENCE_EXPRESSION:[referencedName=JavaClass] FUN:[fqName=test.AnnotatedFlexibleTypes.foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=foo] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt index 77b1fcb9c83..4f231a50cc5 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt @@ -39,14 +39,14 @@ PsiJetFileStubImpl[package=test.a] REFERENCE_EXPRESSION:[referencedName=Annotation] CLASS_BODY: PROPERTY:[fqName=test.a.AnnotationClass.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=i] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.a.AnnotationClass.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=j] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt index fe3bec4fbe2..b42ab37275d 100644 --- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt +++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt @@ -65,7 +65,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=Annotations.c2, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c2] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: @@ -77,7 +77,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=Annotations.withCustomAccessors, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=true, name=withCustomAccessors] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] @@ -140,7 +140,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=Annotations.types, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=types] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=param] TYPE_REFERENCE: @@ -176,7 +176,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=Annotations.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[private] ANNOTATION: diff --git a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt index c0de39503ba..894174e4176 100644 --- a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt +++ b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=test] IMPORT_LIST: CLASS:[fqName=test.ClassMembers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassMembers, superNames=[]] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -39,21 +39,21 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=String] CLASS_BODY: PROPERTY:[fqName=test.ClassMembers.abstractVar, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=true, name=abstractVar] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.ClassMembers.foo, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=foo] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.ClassMembers.openVal, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=openVal] - MODIFIER_LIST:[open internal] + MODIFIER_LIST:[open public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] @@ -74,14 +74,14 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] PROPERTY:[fqName=test.ClassMembers.p5, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=p5] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] FUN:[fqName=test.ClassMembers.abstractFun, hasBlockBody=true, hasBody=false, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=abstractFun] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -89,7 +89,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=test.ClassMembers.bar, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=bar] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -97,7 +97,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.ClassMembers.openFun, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=openFun] - MODIFIER_LIST:[open internal] + MODIFIER_LIST:[open public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt index 536cba0ec46..d6f1d91679d 100644 --- a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt +++ b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt @@ -5,7 +5,7 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION:[referencedName=class_object] IMPORT_LIST: CLASS:[fqName=test.class_object.ClassObject, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassObject, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -14,14 +14,14 @@ PsiJetFileStubImpl[package=test.class_object] MODIFIER_LIST:[public companion] CLASS_BODY: PROPERTY:[fqName=test.class_object.ClassObject.Companion.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=j] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.class_object.ClassObject.Companion.z, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=z] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -29,26 +29,26 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS:[fqName=test.class_object.ClassObject.Companion.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: CLASS:[fqName=test.class_object.ClassObject.Companion.A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: PROPERTY:[fqName=test.class_object.ClassObject.Companion.A.B.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=i] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.class_object.ClassObject.Companion.A.B.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -56,14 +56,14 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.class_object.ClassObject.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.class_object.ClassObject.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -71,7 +71,7 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=test.class_object.ClassObject.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -80,7 +80,7 @@ PsiJetFileStubImpl[package=test.class_object] MODIFIER_LIST:[public companion] CLASS_BODY: CLASS:[fqName=test.class_object.ClassObject.B.Companion.C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -89,7 +89,7 @@ PsiJetFileStubImpl[package=test.class_object] MODIFIER_LIST:[public companion] CLASS_BODY: CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -98,14 +98,14 @@ PsiJetFileStubImpl[package=test.class_object] MODIFIER_LIST:[public companion] CLASS_BODY: PROPERTY:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=i] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -113,7 +113,7 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=annotation] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: @@ -135,7 +135,7 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION:[referencedName=Annotation] CLASS_BODY: CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] - MODIFIER_LIST:[enum internal final] + MODIFIER_LIST:[enum public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[private] VALUE_PARAMETER_LIST: diff --git a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt index 1f0d2d18d08..6da9cbf05bd 100644 --- a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt +++ b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt @@ -32,21 +32,21 @@ PsiJetFileStubImpl[package=a.b.c] REFERENCE_EXPRESSION:[referencedName=String] CLASS_BODY: PROPERTY:[fqName=a.b.c.DataClass.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=i] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=a.b.c.DataClass.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=j] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] FUN:[fqName=a.b.c.DataClass.component1, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=component1] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -54,7 +54,7 @@ PsiJetFileStubImpl[package=a.b.c] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=a.b.c.DataClass.component2, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=component2] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -62,7 +62,7 @@ PsiJetFileStubImpl[package=a.b.c] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] FUN:[fqName=a.b.c.DataClass.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt index bf019fac44a..5670e5c966f 100644 --- a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt +++ b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: IMPORT_LIST: CLASS:[fqName=Delegation, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Delegation, superNames=[T]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -23,14 +23,14 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION:[referencedName=T] CLASS_BODY: PROPERTY:[fqName=Delegation.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=Delegation.ff, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=ff] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt index 0880c80e743..d8a7fd21464 100644 --- a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt +++ b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt @@ -18,7 +18,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=Nested] CLASS_BODY: FUN:[fqName=test.DependencyOnNestedClasses.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=nc] TYPE_REFERENCE: diff --git a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt index b57226a6784..d6b31eaabb4 100644 --- a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt +++ b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt @@ -11,7 +11,7 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] REFERENCE_EXPRESSION:[referencedName=enum] IMPORT_LIST: CLASS:[fqName=a.b.c.test.enum.Enum, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Enum, superNames=[Enum]] - MODIFIER_LIST:[enum internal final] + MODIFIER_LIST:[enum public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[private] VALUE_PARAMETER_LIST: @@ -48,14 +48,14 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] MODIFIER_LIST:[public companion] CLASS_BODY: PROPERTY:[fqName=a.b.c.test.enum.Enum.Companion.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] 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] + MODIFIER_LIST:[open public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt index 58b4e3552bb..cb2938db1ee 100644 --- a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt +++ b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt @@ -3,20 +3,20 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=test] IMPORT_LIST: CLASS:[fqName=test.FlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=FlexibleTypes, superNames=[]] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: PROPERTY:[fqName=test.FlexibleTypes.p, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=p] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.FlexibleTypes.collection, hasBlockBody=true, hasBody=false, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=collection] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -31,7 +31,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.FlexibleTypes.withBody, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=withBody] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt index 169aff9721f..695a2d5df24 100644 --- a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt +++ b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt @@ -3,13 +3,13 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=a] IMPORT_LIST: CLASS:[fqName=a.InheritingClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InheritingClasses, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: CLASS:[fqName=a.InheritingClasses.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[C]] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -30,28 +30,28 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=C] CLASS_BODY: PROPERTY:[fqName=a.InheritingClasses.A.ap, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=ap] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=a.InheritingClasses.A.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[open internal] + MODIFIER_LIST:[open public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=a.InheritingClasses.A.op, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=op] - MODIFIER_LIST:[open internal] + MODIFIER_LIST:[open public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=a.InheritingClasses.A.af, hasBlockBody=true, hasBody=false, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=af] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -59,7 +59,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=a.InheritingClasses.A.of, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=of] - MODIFIER_LIST:[open internal] + MODIFIER_LIST:[open public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -67,7 +67,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS:[fqName=a.InheritingClasses.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[A]] - MODIFIER_LIST:[open internal] + MODIFIER_LIST:[open public] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -82,21 +82,21 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=A] CLASS_BODY: PROPERTY:[fqName=a.InheritingClasses.B.ap, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=ap] - MODIFIER_LIST:[open internal] + MODIFIER_LIST:[open public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=a.InheritingClasses.B.op, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=op] - MODIFIER_LIST:[open internal] + MODIFIER_LIST:[open public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=a.InheritingClasses.B.af, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=af] - MODIFIER_LIST:[open internal] + MODIFIER_LIST:[open public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -104,7 +104,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=a.InheritingClasses.B.of, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=of] - MODIFIER_LIST:[open internal] + MODIFIER_LIST:[open public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -112,17 +112,17 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS:[fqName=a.InheritingClasses.C, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=C, superNames=[]] - MODIFIER_LIST:[internal] + MODIFIER_LIST:[public] CLASS_BODY: PROPERTY:[fqName=a.InheritingClasses.C.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS:[fqName=a.InheritingClasses.D, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=D, superNames=[C]] - MODIFIER_LIST:[internal] + MODIFIER_LIST:[public] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T] DELEGATION_SPECIFIER_LIST: @@ -136,17 +136,17 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=C] CLASS_BODY: PROPERTY:[fqName=a.InheritingClasses.D.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS:[fqName=a.InheritingClasses.E, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=E, superNames=[]] - MODIFIER_LIST:[internal] + MODIFIER_LIST:[public] CLASS_BODY: CLASS:[fqName=a.InheritingClasses.G, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=G, superNames=[B, C, D, E]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -192,25 +192,25 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=E] CLASS_BODY: CLASS:[fqName=a.InheritingClasses.InheritAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritAny, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: CLASS:[fqName=a.InheritingClasses.InheritAny.ExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ExplicitAny, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: CLASS:[fqName=a.InheritingClasses.InheritAny.ImplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ImplicitAny, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: CLASS:[fqName=a.InheritingClasses.InheritAny.OnlyTrait, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTrait, superNames=[SomeTrait]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -227,7 +227,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=SomeTrait] CLASS_BODY: CLASS:[fqName=a.InheritingClasses.InheritAny.OnlyTraits, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTraits, superNames=[SomeTrait, SomeTrait2]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -254,13 +254,13 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=SomeTrait2] CLASS_BODY: CLASS:[fqName=a.InheritingClasses.InheritAny.SomeTrait, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeTrait, superNames=[]] - MODIFIER_LIST:[internal] + MODIFIER_LIST:[public] CLASS_BODY: CLASS:[fqName=a.InheritingClasses.InheritAny.SomeTrait2, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeTrait2, superNames=[]] - MODIFIER_LIST:[internal] + MODIFIER_LIST:[public] CLASS_BODY: CLASS:[fqName=a.InheritingClasses.InheritAny.TraitWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitWithExplicitAny, superNames=[Any, SomeTrait]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -283,7 +283,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=SomeTrait] CLASS_BODY: CLASS:[fqName=a.InheritingClasses.InheritAny.TraitsWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitsWithExplicitAny, superNames=[SomeTrait2, Any, SomeTrait]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -316,7 +316,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=SomeTrait] CLASS_BODY: CLASS:[fqName=a.InheritingClasses.InheritExtensionFunctionType, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritExtensionFunctionType, superNames=[]] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -352,7 +352,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=Int] CLASS_BODY: CLASS:[fqName=a.InheritingClasses.InheritFunctionType, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritFunctionType, superNames=[]] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: diff --git a/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt b/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt index 031358bcefa..9911b913479 100644 --- a/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt +++ b/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=test] IMPORT_LIST: CLASS:[fqName=test.LocalClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=LocalClass, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: diff --git a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt index ba138121848..41a5d1424ee 100644 --- a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt +++ b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=test] IMPORT_LIST: CLASS:[fqName=test.NestedClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=NestedClasses, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=TOuter] PRIMARY_CONSTRUCTOR: @@ -11,14 +11,14 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: CLASS_BODY: PROPERTY:[fqName=test.NestedClasses.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.NestedClasses.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -37,7 +37,7 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: CLASS_BODY: FUN:[fqName=test.NestedClasses.Inner.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: @@ -57,7 +57,7 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: CLASS_BODY: FUN:[fqName=test.NestedClasses.Inner.II.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: @@ -103,14 +103,14 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: CLASS_BODY: PROPERTY:[fqName=test.NestedClasses.Nested.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.NestedClasses.Nested.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: @@ -122,7 +122,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=test.NestedClasses.Nested.NI, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NI, superNames=[]] - MODIFIER_LIST:[inner internal final] + MODIFIER_LIST:[inner public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=TNI] TYPE_REFERENCE: @@ -133,7 +133,7 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: CLASS_BODY: FUN:[fqName=test.NestedClasses.Nested.NI.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: @@ -157,14 +157,14 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: CLASS_BODY: PROPERTY:[fqName=test.NestedClasses.Nested.NN.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.NestedClasses.Nested.NN.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: diff --git a/idea/testData/decompiler/stubBuilder/Objects/Objects.txt b/idea/testData/decompiler/stubBuilder/Objects/Objects.txt index e96c3bfff10..1d301c2e0cb 100644 --- a/idea/testData/decompiler/stubBuilder/Objects/Objects.txt +++ b/idea/testData/decompiler/stubBuilder/Objects/Objects.txt @@ -5,14 +5,14 @@ PsiJetFileStubImpl[package=] MODIFIER_LIST:[public] CLASS_BODY: PROPERTY:[fqName=Objects.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=Objects.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -28,14 +28,14 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION:[referencedName=A] CLASS_BODY: PROPERTY:[fqName=Objects.InnerObject.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=Objects.InnerObject.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -59,14 +59,14 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION:[referencedName=NestedClass] CLASS_BODY: PROPERTY:[fqName=Objects.OtherObject.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=Objects.OtherObject.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt b/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt index 72797c2df2d..eb8a4be96f6 100644 --- a/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt +++ b/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=p] REFERENCE_EXPRESSION:[referencedName=p] IMPORT_LIST: CLASS:[fqName=p.PrivateToThis, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PrivateToThis, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=true, isOutVariance=false, name=I] MODIFIER_LIST:[in] diff --git a/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt b/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt index 389c3ed96da..2afcff17bed 100644 --- a/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt +++ b/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt @@ -3,13 +3,13 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=test] IMPORT_LIST: CLASS:[fqName=test.Sealed, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Sealed, superNames=[]] - MODIFIER_LIST:[internal sealed] + MODIFIER_LIST:[public sealed] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[private] VALUE_PARAMETER_LIST: CLASS_BODY: CLASS:[fqName=test.Sealed.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[Sealed]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -22,7 +22,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=Sealed] CLASS_BODY: OBJECT_DECLARATION:[fqName=test.Sealed.Top, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Top, superNames=[Sealed]] - MODIFIER_LIST:[internal] + MODIFIER_LIST:[public] DELEGATION_SPECIFIER_LIST: DELEGATOR_SUPER_CLASS: TYPE_REFERENCE: diff --git a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt index 5c8b6c47460..11299b66474 100644 --- a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt +++ b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=test] IMPORT_LIST: CLASS:[fqName=test.SecondaryConstructors, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SecondaryConstructors, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: @@ -40,7 +40,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS:[fqName=test.SecondaryConstructors.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] - MODIFIER_LIST:[inner internal final] + MODIFIER_LIST:[inner public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T] TYPE_REFERENCE: @@ -75,7 +75,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=G] CLASS:[fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] CLASS_BODY: SECONDARY_CONSTRUCTOR: MODIFIER_LIST:[public] diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt index 5c0f9d5af06..77ff97ab06e 100644 --- a/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt +++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt @@ -9,7 +9,7 @@ PsiJetFileStubImpl[package=a.b.c.topLevelMembersAnnotated] REFERENCE_EXPRESSION:[referencedName=topLevelMembersAnnotated] IMPORT_LIST: PROPERTY:[fqName=a.b.c.topLevelMembersAnnotated.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=i] - MODIFIER_LIST:[internal] + MODIFIER_LIST:[public] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: @@ -38,7 +38,7 @@ PsiJetFileStubImpl[package=a.b.c.topLevelMembersAnnotated] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=a.b.c.topLevelMembersAnnotated.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=f] - MODIFIER_LIST:[internal] + MODIFIER_LIST:[public] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt index 121d20e8b85..9ad56b6e32e 100644 --- a/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt +++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt @@ -38,7 +38,7 @@ PsiJetFileStubImpl[package=foo.TopLevelMembers] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] FUN:[fqName=foo.TopLevelMembers.funWithBlockBody, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithBlockBody] - MODIFIER_LIST:[internal] + MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt index 63d18eeae56..985353bad73 100644 --- a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt +++ b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=test] IMPORT_LIST: CLASS:[fqName=test.TypeBoundsAndDelegationSpecifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeBoundsAndDelegationSpecifiers, superNames=[A, T]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=H] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G] diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt index fa26f18da2e..2e73756f521 100644 --- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt +++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=test] IMPORT_LIST: CLASS:[fqName=test.TypeParams, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeParams, superNames=[]] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=true, isOutVariance=false, name=T1] MODIFIER_LIST:[in] @@ -80,12 +80,12 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=T6] CLASS_BODY: PROPERTY:[fqName=test.TypeParams.useSomeParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=useSomeParam] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=T2] PROPERTY:[fqName=test.TypeParams.withOwnBoundedParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=withOwnBoundedParam] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1] TYPE_REFERENCE: @@ -98,7 +98,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=G1] PROPERTY:[fqName=test.TypeParams.withOwnBoundedParamByOther, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=withOwnBoundedParamByOther] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1] TYPE_REFERENCE: @@ -108,7 +108,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=G1] PROPERTY:[fqName=test.TypeParams.withOwnParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=withOwnParam] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1] TYPE_REFERENCE: @@ -148,7 +148,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=T] FUN:[fqName=test.TypeParams.useParams, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=useParams] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: @@ -185,7 +185,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=test.TypeParams.useParamsInOtherOrder, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=useParamsInOtherOrder] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: @@ -213,7 +213,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=test.TypeParams.useParamsInTypeArg, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=useParamsInTypeArg] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: @@ -268,7 +268,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=test.TypeParams.withOwnParams, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=true, isExtension=false, isTopLevel=false, name=withOwnParams] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G2] @@ -309,7 +309,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=test.TypeParams.withOwnParamsAndTypeConstraints, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=true, isExtension=false, isTopLevel=false, name=withOwnParamsAndTypeConstraints] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G2] @@ -372,7 +372,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] FUN:[fqName=test.TypeParams.withOwnParamsClashing, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=true, isExtension=false, isTopLevel=false, name=withOwnParamsClashing] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T1] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T2] @@ -404,7 +404,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=test.TypeParams.withOwnParamExtension, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=true, isExtension=true, isTopLevel=false, name=withOwnParamExtension] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T1] TYPE_REFERENCE: @@ -421,7 +421,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=test.TypeParams.withOwnParamExtensionAfterName, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=true, isExtension=true, isTopLevel=false, name=withOwnParamExtensionAfterName] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T1] TYPE_REFERENCE: diff --git a/idea/testData/decompiler/stubBuilder/Types/Types.txt b/idea/testData/decompiler/stubBuilder/Types/Types.txt index 29b658a0207..2fddc99b0cf 100644 --- a/idea/testData/decompiler/stubBuilder/Types/Types.txt +++ b/idea/testData/decompiler/stubBuilder/Types/Types.txt @@ -3,13 +3,13 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=test] IMPORT_LIST: CLASS:[fqName=test.Types, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Types, superNames=[]] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: PROPERTY:[fqName=test.Types.deepExtFunctionType, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=deepExtFunctionType] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: FUNCTION_TYPE: FUNCTION_TYPE_RECEIVER: @@ -56,7 +56,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] PROPERTY:[fqName=test.Types.extFun, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=extFun] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: FUNCTION_TYPE: FUNCTION_TYPE_RECEIVER: @@ -78,7 +78,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] PROPERTY:[fqName=test.Types.extFunction, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=extFunction] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: FUNCTION_TYPE: FUNCTION_TYPE_RECEIVER: @@ -101,7 +101,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] PROPERTY:[fqName=test.Types.extFunctionWithNullables, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=extFunctionWithNullables] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: FUNCTION_TYPE: FUNCTION_TYPE_RECEIVER: @@ -140,7 +140,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] PROPERTY:[fqName=test.Types.extFunctionWithParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=extFunctionWithParam] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: FUNCTION_TYPE: FUNCTION_TYPE_RECEIVER: @@ -175,7 +175,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] PROPERTY:[fqName=test.Types.funTypeWithStarAndNonStar, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=funTypeWithStarAndNonStar] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] @@ -190,7 +190,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.Types.function, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=function] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: FUNCTION_TYPE: VALUE_PARAMETER_LIST: @@ -200,7 +200,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] PROPERTY:[fqName=test.Types.functionWithParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=functionWithParam] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: FUNCTION_TYPE: VALUE_PARAMETER_LIST: @@ -229,7 +229,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] PROPERTY:[fqName=test.Types.list, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=list] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] @@ -243,7 +243,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.Types.listExtStarFun, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=listExtStarFun] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] @@ -260,7 +260,7 @@ PsiJetFileStubImpl[package=test] TYPE_PROJECTION:[projectionKind=STAR] TYPE_PROJECTION:[projectionKind=STAR] PROPERTY:[fqName=test.Types.map, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=map] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] @@ -280,7 +280,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.Types.nullable, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=nullable] - MODIFIER_LIST:[internal final] + MODIFIER_LIST:[public final] TYPE_REFERENCE: NULLABLE_TYPE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -288,7 +288,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.Types.nullableMap, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=nullableMap] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: NULLABLE_TYPE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -311,7 +311,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.Types.projections, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=projections] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] @@ -333,7 +333,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] PROPERTY:[fqName=test.Types.starFun, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=starFun] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] @@ -343,7 +343,7 @@ PsiJetFileStubImpl[package=test] TYPE_PROJECTION:[projectionKind=STAR] TYPE_PROJECTION:[projectionKind=STAR] PROPERTY:[fqName=test.Types.starList, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=starList] - MODIFIER_LIST:[abstract internal] + MODIFIER_LIST:[abstract public] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false]