diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt index a7a152e91e1..4f6a0739377 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.psi.stubs import com.intellij.psi.PsiNamedElement import com.intellij.psi.stubs.NamedStub -import org.jetbrains.kotlin.name.FqName -import com.intellij.psi.stubs.StubElement import com.intellij.psi.stubs.PsiFileStub +import com.intellij.psi.stubs.StubElement import org.jetbrains.kotlin.lexer.KtModifierKeywordToken +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* interface KotlinFileStub : PsiFileStub { @@ -72,7 +72,6 @@ interface KotlinFunctionStub : KotlinCallableStubBase { } interface KotlinImportDirectiveStub : StubElement { - fun isAbsoluteInRootPackage(): Boolean fun isAllUnder(): Boolean fun getImportedFqName(): FqName? fun getAliasName(): String? @@ -125,9 +124,7 @@ interface KotlinTypeProjectionStub : StubElement { fun getProjectionKind(): KtProjectionKind } -interface KotlinUserTypeStub : StubElement { - fun isAbsoluteInRootPackage(): Boolean -} +interface KotlinUserTypeStub : StubElement interface KotlinScriptStub : KotlinStubWithFqName { override fun getFqName(): FqName diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtFileElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtFileElementType.java index 928a579a373..f71538a8d79 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtFileElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtFileElementType.java @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.stubs.KotlinFileStub; import java.io.IOException; public class KtFileElementType extends IStubFileElementType { - public static final int STUB_VERSION = 66; + public static final int STUB_VERSION = 67; private static final String NAME = "kotlin.FILE"; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtImportDirectiveElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtImportDirectiveElementType.java index 44d2d7e5d1a..c082c3d29db 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtImportDirectiveElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtImportDirectiveElementType.java @@ -39,13 +39,11 @@ public class KtImportDirectiveElementType extends KtStubElementType, - private val isAbsoluteInRootPackage: Boolean, private val isAllUnder: Boolean, private val importedFqName: StringRef?, private val aliasName: StringRef?, - private val isValid: Boolean) : KotlinStubBaseImpl(parent, KtStubElementTypes.IMPORT_DIRECTIVE), KotlinImportDirectiveStub { - - override fun isAbsoluteInRootPackage(): Boolean = isAbsoluteInRootPackage + private val isValid: Boolean +) : KotlinStubBaseImpl(parent, KtStubElementTypes.IMPORT_DIRECTIVE), KotlinImportDirectiveStub { override fun isAllUnder(): Boolean = isAllUnder override fun getImportedFqName(): FqName? { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinUserTypeStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinUserTypeStubImpl.kt index 6b0c342d024..30e4125a854 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinUserTypeStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinUserTypeStubImpl.kt @@ -16,15 +16,12 @@ package org.jetbrains.kotlin.psi.stubs.impl +import com.intellij.psi.PsiElement import com.intellij.psi.stubs.StubElement import org.jetbrains.kotlin.psi.KtUserType import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes -import com.intellij.psi.PsiElement class KotlinUserTypeStubImpl( - parent: StubElement?, - private val isAbsoluteInRootPackage: Boolean -) : KotlinStubBaseImpl(parent, KtStubElementTypes.USER_TYPE), KotlinUserTypeStub { - override fun isAbsoluteInRootPackage() = isAbsoluteInRootPackage -} + parent: StubElement? +) : KotlinStubBaseImpl(parent, KtStubElementTypes.USER_TYPE), KotlinUserTypeStub diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt index 330bd94550b..e617ea41e52 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt @@ -152,7 +152,7 @@ fun createStubForTypeName( fun recCreateStubForType(current: StubElement, level: Int): KotlinUserTypeStub { val lastSegment = segments[level] - val userTypeStub = KotlinUserTypeStubImpl(current, isAbsoluteInRootPackage = false) + val userTypeStub = KotlinUserTypeStubImpl(current) if (level + 1 < segments.size) { recCreateStubForType(userTypeStub, level + 1) } diff --git a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt index 8ee032c017f..07ea2d2120c 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt @@ -9,39 +9,39 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=javaClass] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=d] 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=MutableCollection] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt index 2edc0a2b737..7f426b331cc 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt @@ -11,35 +11,35 @@ PsiJetFileStubImpl[package=test.a] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=j] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt index e5310166d98..534c7a49a9c 100644 --- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt +++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt @@ -6,14 +6,14 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[private] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c1] @@ -21,11 +21,11 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c2] @@ -33,11 +33,11 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS_BODY: @@ -50,18 +50,18 @@ PsiJetFileStubImpl[package=] ANNOTATION_TARGET:[useSiteTarget=FIELD] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=f] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=Annotations.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] MODIFIER_LIST:[private final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=Annotations.c1, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c1] @@ -69,11 +69,11 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -81,18 +81,18 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=Annotations.annotationWithVararg, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=annotationWithVararg] @@ -103,16 +103,16 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=Annotations.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] @@ -120,12 +120,12 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=Annotations.g, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=g] @@ -133,7 +133,7 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] @@ -141,14 +141,14 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=E] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=Annotations.inlineFun, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=true, isExtension=false, isTopLevel=false, name=inlineFun] @@ -159,19 +159,19 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=F] MODIFIER_LIST:[] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=Annotations.types, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=types] @@ -182,16 +182,16 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=b] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=b] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=ranges] REFERENCE_EXPRESSION:[referencedName=LongRange] @@ -199,15 +199,15 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=b] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=b] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=Annotations.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] @@ -218,15 +218,15 @@ PsiJetFileStubImpl[package=] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Enum] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Annotations] REFERENCE_EXPRESSION:[referencedName=En] CLASS_BODY: @@ -236,19 +236,19 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] ENUM_ENTRY:[fqName=Annotations.En.Entry3, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=Entry3, superNames=[]] MODIFIER_LIST:[] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=c] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=c] CLASS:[fqName=Annotations.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] MODIFIER_LIST:[public final] @@ -257,7 +257,7 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] VALUE_PARAMETER_LIST: CLASS_BODY: diff --git a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt index 894174e4176..84281617dc7 100644 --- a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt +++ b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt @@ -9,98 +9,98 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p5] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.ClassMembers.p, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=p] MODIFIER_LIST:[private final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.ClassMembers.p2, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=true, name=p2] MODIFIER_LIST:[open public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] diff --git a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt index 3bbefb5f534..e6cbb4c1a4d 100644 --- a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt +++ b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt @@ -16,16 +16,16 @@ PsiJetFileStubImpl[package=test.class_object] 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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=[]] @@ -43,31 +43,31 @@ PsiJetFileStubImpl[package=test.class_object] 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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=[]] @@ -100,16 +100,16 @@ PsiJetFileStubImpl[package=test.class_object] 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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]] @@ -120,8 +120,8 @@ PsiJetFileStubImpl[package=test.class_object] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Annotation] CLASS_BODY: @@ -133,23 +133,23 @@ PsiJetFileStubImpl[package=test.class_object] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Enum] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=class_object] REFERENCE_EXPRESSION:[referencedName=ClassObject] diff --git a/idea/testData/decompiler/stubBuilder/Const/Const.txt b/idea/testData/decompiler/stubBuilder/Const/Const.txt index c80271559af..38d57c42ed4 100644 --- a/idea/testData/decompiler/stubBuilder/Const/Const.txt +++ b/idea/testData/decompiler/stubBuilder/Const/Const.txt @@ -8,7 +8,7 @@ PsiJetFileStubImpl[package=test] PROPERTY:[fqName=test.Const.inObject, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=inObject] MODIFIER_LIST:[private final const] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt index 4b90a654d32..508995328cb 100644 --- a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt +++ b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt @@ -13,52 +13,52 @@ PsiJetFileStubImpl[package=a.b.c] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=j] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final operator] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final operator] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt index 5d14dca4e98..004812a2528 100644 --- a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt +++ b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt @@ -8,32 +8,32 @@ PsiJetFileStubImpl[package=] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=a] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=A] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt index f34edaa3a30..1cd7c0ff890 100644 --- a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt +++ b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt @@ -10,9 +10,9 @@ PsiJetFileStubImpl[package=test] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=dependency] REFERENCE_EXPRESSION:[referencedName=D] REFERENCE_EXPRESSION:[referencedName=Nested] @@ -22,46 +22,46 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=nc] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=dependency] REFERENCE_EXPRESSION:[referencedName=D] REFERENCE_EXPRESSION:[referencedName=Companion] REFERENCE_EXPRESSION:[referencedName=NestedInClassObject] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=dependency] REFERENCE_EXPRESSION:[referencedName=D] REFERENCE_EXPRESSION:[referencedName=Inner] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=ii] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=dependency] REFERENCE_EXPRESSION:[referencedName=D] REFERENCE_EXPRESSION:[referencedName=Inner] REFERENCE_EXPRESSION:[referencedName=Inner] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=nn] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=dependency] REFERENCE_EXPRESSION:[referencedName=D] REFERENCE_EXPRESSION:[referencedName=Nested] REFERENCE_EXPRESSION:[referencedName=Nested] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=dependency] REFERENCE_EXPRESSION:[referencedName=D] REFERENCE_EXPRESSION:[referencedName=Nested] diff --git a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt index 30931c5fa66..1445217a7d1 100644 --- a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt +++ b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt @@ -18,19 +18,19 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Enum] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=b] REFERENCE_EXPRESSION:[referencedName=c] @@ -52,12 +52,12 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Ann] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=b] REFERENCE_EXPRESSION:[referencedName=c] @@ -65,15 +65,15 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] REFERENCE_EXPRESSION:[referencedName=enum] REFERENCE_EXPRESSION:[referencedName=Ann] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt index 1c126abc1a4..5cfa9390add 100644 --- a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt +++ b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt @@ -11,32 +11,32 @@ PsiJetFileStubImpl[package=test] PROPERTY:[fqName=test.FlexibleTypes.p, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=p] MODIFIER_LIST:[abstract public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=List] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt index 23eb8c5bd77..bf0b9282180 100644 --- a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt +++ b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt @@ -15,16 +15,16 @@ PsiJetFileStubImpl[package=a] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=C] @@ -32,38 +32,38 @@ PsiJetFileStubImpl[package=a] 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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]] @@ -74,9 +74,9 @@ PsiJetFileStubImpl[package=a] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=A] @@ -84,31 +84,31 @@ PsiJetFileStubImpl[package=a] 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS:[fqName=a.InheritingClasses.C, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=C, superNames=[]] @@ -117,8 +117,8 @@ PsiJetFileStubImpl[package=a] 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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]] @@ -128,9 +128,9 @@ PsiJetFileStubImpl[package=a] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=C] @@ -138,8 +138,8 @@ PsiJetFileStubImpl[package=a] 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS:[fqName=a.InheritingClasses.E, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=E, superNames=[]] @@ -153,40 +153,40 @@ PsiJetFileStubImpl[package=a] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=B] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=C] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=D] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=E] @@ -217,10 +217,10 @@ PsiJetFileStubImpl[package=a] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=InheritAny] @@ -234,20 +234,20 @@ PsiJetFileStubImpl[package=a] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=InheritAny] REFERENCE_EXPRESSION:[referencedName=SomeTrait] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=InheritAny] @@ -267,16 +267,16 @@ PsiJetFileStubImpl[package=a] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Any] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=InheritAny] @@ -290,26 +290,26 @@ PsiJetFileStubImpl[package=a] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=InheritAny] REFERENCE_EXPRESSION:[referencedName=SomeTrait2] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Any] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=InheritAny] @@ -327,19 +327,19 @@ PsiJetFileStubImpl[package=a] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS_BODY: diff --git a/idea/testData/decompiler/stubBuilder/InnerTypes/InnerTypes.txt b/idea/testData/decompiler/stubBuilder/InnerTypes/InnerTypes.txt index 5a0d16fcb17..5c07dcb79b3 100644 --- a/idea/testData/decompiler/stubBuilder/InnerTypes/InnerTypes.txt +++ b/idea/testData/decompiler/stubBuilder/InnerTypes/InnerTypes.txt @@ -16,45 +16,45 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=InnerTypes] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Double] REFERENCE_EXPRESSION:[referencedName=Inner2] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=y] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=InnerTypes] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=E] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=F] REFERENCE_EXPRESSION:[referencedName=Inner2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=test.InnerTypes.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] @@ -79,134 +79,134 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=InnerTypes] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=F] REFERENCE_EXPRESSION:[referencedName=Inner] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=y] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=InnerTypes] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=E] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=F] REFERENCE_EXPRESSION:[referencedName=Inner] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=E] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Double] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=z] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=InnerTypes] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=F] REFERENCE_EXPRESSION:[referencedName=Inner] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] REFERENCE_EXPRESSION:[referencedName=Inner3] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Double] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=w] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=InnerTypes] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=E] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=F] REFERENCE_EXPRESSION:[referencedName=Inner] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=H] REFERENCE_EXPRESSION:[referencedName=Inner3] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=STAR] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=test.InnerTypes.Inner2, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner2, superNames=[]] diff --git a/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt b/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt index 9911b913479..49ac10cabf6 100644 --- a/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt +++ b/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt @@ -11,31 +11,31 @@ PsiJetFileStubImpl[package=test] PROPERTY:[fqName=test.LocalClass.bar, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=bar] MODIFIER_LIST:[private final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Any] PROPERTY:[fqName=test.LocalClass.sam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=sam] MODIFIER_LIST:[private final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=java] REFERENCE_EXPRESSION:[referencedName=lang] REFERENCE_EXPRESSION:[referencedName=Runnable] PROPERTY:[fqName=test.LocalClass.sub, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=sub] MODIFIER_LIST:[private final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Any] FUN:[fqName=test.LocalClass.foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=foo] MODIFIER_LIST:[private final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Any] diff --git a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt index 873b9bbc56c..1a899b54957 100644 --- a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt +++ b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt @@ -9,31 +9,31 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS_BODY: PROPERTY:[fqName=test.Modifiers.extVar, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=true, name=extVar] MODIFIER_LIST:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.Modifiers.x, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=x] MODIFIER_LIST:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.Modifiers.component1, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=component1] MODIFIER_LIST:[public final operator] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.Modifiers.equals, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=equals] @@ -42,21 +42,21 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=other] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Any] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Boolean] FUN:[fqName=test.Modifiers.extFun, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=extFun] MODIFIER_LIST:[public final external] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=test.Modifiers.inlined, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=inlined] @@ -68,8 +68,8 @@ PsiJetFileStubImpl[package=test] FUNCTION_TYPE: VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=arg2] @@ -78,13 +78,13 @@ PsiJetFileStubImpl[package=test] FUNCTION_TYPE: VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=test.Modifiers.sum, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=sum] @@ -92,19 +92,19 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Long] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=sum] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Long] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Long] CLASS:[fqName=test.Modifiers.Ann, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Ann, superNames=[Annotation]] @@ -115,8 +115,8 @@ PsiJetFileStubImpl[package=test] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Annotation] CLASS_BODY: diff --git a/idea/testData/decompiler/stubBuilder/MultifileClass/MultifileClass.txt b/idea/testData/decompiler/stubBuilder/MultifileClass/MultifileClass.txt index ab7991b8969..bd9b72d05a7 100644 --- a/idea/testData/decompiler/stubBuilder/MultifileClass/MultifileClass.txt +++ b/idea/testData/decompiler/stubBuilder/MultifileClass/MultifileClass.txt @@ -7,55 +7,55 @@ PsiJetFileStubImpl[package=test] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Deprecated] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Deprecated] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.p1Val, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=p1Val] MODIFIER_LIST:[public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.p1Var, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=true, name=p1Var] MODIFIER_LIST:[public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.p1ExtVal, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=true, isVar=false, name=p1ExtVal] MODIFIER_LIST:[public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.p1ExprFun, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=p1ExprFun] MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.p1Fun, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=p1Fun] MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=test.p1FunWithParams, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=p1FunWithParams] @@ -63,65 +63,65 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.p1ExtFun, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=true, isTopLevel=true, name=p1ExtFun] MODIFIER_LIST:[public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] PROPERTY:[fqName=test.p2Val, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=p2Val] MODIFIER_LIST:[public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.p2ExtVal, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=true, isVar=false, name=p2ExtVal] MODIFIER_LIST:[public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.p2Fun, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=p2Fun] MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=test.p2ExtFun, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=true, isTopLevel=true, name=p2ExtFun] MODIFIER_LIST:[public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] diff --git a/idea/testData/decompiler/stubBuilder/NamedCompanionObject/NamedCompanionObject.txt b/idea/testData/decompiler/stubBuilder/NamedCompanionObject/NamedCompanionObject.txt index a144988d260..5e5b77d330b 100644 --- a/idea/testData/decompiler/stubBuilder/NamedCompanionObject/NamedCompanionObject.txt +++ b/idea/testData/decompiler/stubBuilder/NamedCompanionObject/NamedCompanionObject.txt @@ -14,16 +14,16 @@ PsiJetFileStubImpl[package=test] PROPERTY:[fqName=test.NamedCompanionObject.Named.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=j] MODIFIER_LIST:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.NamedCompanionObject.Named.z, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=z] MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS:[fqName=test.NamedCompanionObject.Named.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] @@ -41,31 +41,31 @@ PsiJetFileStubImpl[package=test] PROPERTY:[fqName=test.NamedCompanionObject.Named.A.B.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=i] MODIFIER_LIST:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.NamedCompanionObject.Named.A.B.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] PROPERTY:[fqName=test.NamedCompanionObject.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] MODIFIER_LIST:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.NamedCompanionObject.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=test.NamedCompanionObject.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] @@ -98,16 +98,16 @@ PsiJetFileStubImpl[package=test] PROPERTY:[fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=i] MODIFIER_LIST:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]] @@ -118,8 +118,8 @@ PsiJetFileStubImpl[package=test] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Annotation] CLASS_BODY: @@ -131,22 +131,22 @@ PsiJetFileStubImpl[package=test] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Enum] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=NamedCompanionObject] REFERENCE_EXPRESSION:[referencedName=B] diff --git a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt index 192857c41af..a12e8d7140f 100644 --- a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt +++ b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt @@ -13,16 +13,16 @@ PsiJetFileStubImpl[package=test] PROPERTY:[fqName=test.NestedClasses.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] MODIFIER_LIST:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=test.NestedClasses.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] @@ -30,7 +30,7 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=TI] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TOuter] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -41,11 +41,11 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TI] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=test.NestedClasses.Inner.II, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=II, superNames=[]] @@ -61,47 +61,47 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TII] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=NestedClasses] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TOuter] REFERENCE_EXPRESSION:[referencedName=Inner] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TI] REFERENCE_EXPRESSION:[referencedName=II] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=NestedClasses] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TOuter] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TOuter] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=test.NestedClasses.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] @@ -115,8 +115,8 @@ PsiJetFileStubImpl[package=test] PROPERTY:[fqName=test.NestedClasses.Nested.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] MODIFIER_LIST:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -124,11 +124,11 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TN] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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=[]] @@ -136,7 +136,7 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=TNI] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TN] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -147,15 +147,15 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TN] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TNI] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=test.NestedClasses.Nested.NN, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NN, superNames=[]] @@ -169,8 +169,8 @@ PsiJetFileStubImpl[package=test] 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -178,10 +178,10 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=TNN] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] diff --git a/idea/testData/decompiler/stubBuilder/Objects/Objects.txt b/idea/testData/decompiler/stubBuilder/Objects/Objects.txt index b12af893c25..0ea76761fb7 100644 --- a/idea/testData/decompiler/stubBuilder/Objects/Objects.txt +++ b/idea/testData/decompiler/stubBuilder/Objects/Objects.txt @@ -7,16 +7,16 @@ PsiJetFileStubImpl[package=] PROPERTY:[fqName=Objects.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] MODIFIER_LIST:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] OBJECT_DECLARATION:[fqName=Objects.InnerObject, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=InnerObject, superNames=[A]] @@ -24,22 +24,22 @@ PsiJetFileStubImpl[package=] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] CLASS:[fqName=Objects.NestedClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NestedClass, superNames=[]] @@ -53,23 +53,23 @@ PsiJetFileStubImpl[package=] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Objects] 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:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] diff --git a/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt b/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt index eb8a4be96f6..8019e00a944 100644 --- a/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt +++ b/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt @@ -14,26 +14,26 @@ PsiJetFileStubImpl[package=p] PROPERTY:[fqName=p.PrivateToThis.bar, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=true, name=bar] MODIFIER_LIST:[private final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=I] PROPERTY:[fqName=p.PrivateToThis.foo, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=foo] MODIFIER_LIST:[private final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=I] PROPERTY:[fqName=p.PrivateToThis.val_with_accessors, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=val_with_accessors] MODIFIER_LIST:[private final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=I] PROPERTY:[fqName=p.PrivateToThis.var_with_accessors, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=true, name=var_with_accessors] MODIFIER_LIST:[private final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=I] FUN:[fqName=p.PrivateToThis.bas, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=bas] MODIFIER_LIST:[private final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=I] diff --git a/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt b/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt index 5454b652a54..6c5e7854fa8 100644 --- a/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt +++ b/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt @@ -16,8 +16,8 @@ PsiJetFileStubImpl[package=test] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=Sealed] CLASS_BODY: @@ -26,8 +26,8 @@ PsiJetFileStubImpl[package=test] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=Sealed] CLASS_BODY: diff --git a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt index a70197acfde..23ad7d726ce 100644 --- a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt +++ b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt @@ -9,8 +9,8 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Boolean] CLASS_BODY: @@ -19,15 +19,15 @@ PsiJetFileStubImpl[package=test] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=anno] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=anno] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] SECONDARY_CONSTRUCTOR: @@ -35,8 +35,8 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS:[fqName=test.SecondaryConstructors.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] @@ -44,23 +44,23 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_CONSTRAINT_LIST: TYPE_CONSTRAINT: REFERENCE_EXPRESSION:[referencedName=G] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=java] REFERENCE_EXPRESSION:[referencedName=io] REFERENCE_EXPRESSION:[referencedName=Serializable] @@ -70,11 +70,11 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=g] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G] CLASS:[fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] MODIFIER_LIST:[public final] @@ -84,15 +84,15 @@ PsiJetFileStubImpl[package=test] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=anno] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=anno] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=z] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] SECONDARY_CONSTRUCTOR: diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt index 77ff97ab06e..6e39f9fc718 100644 --- a/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt +++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt @@ -13,10 +13,10 @@ PsiJetFileStubImpl[package=a.b.c.topLevelMembersAnnotated] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=d] REFERENCE_EXPRESSION:[referencedName=e] REFERENCE_EXPRESSION:[referencedName=f] @@ -24,17 +24,17 @@ PsiJetFileStubImpl[package=a.b.c.topLevelMembersAnnotated] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=b] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=d] REFERENCE_EXPRESSION:[referencedName=e] REFERENCE_EXPRESSION:[referencedName=f] REFERENCE_EXPRESSION:[referencedName=b] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -42,10 +42,10 @@ PsiJetFileStubImpl[package=a.b.c.topLevelMembersAnnotated] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=d] REFERENCE_EXPRESSION:[referencedName=e] REFERENCE_EXPRESSION:[referencedName=f] @@ -53,10 +53,10 @@ PsiJetFileStubImpl[package=a.b.c.topLevelMembersAnnotated] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=b] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=d] REFERENCE_EXPRESSION:[referencedName=e] REFERENCE_EXPRESSION:[referencedName=f] @@ -67,10 +67,10 @@ PsiJetFileStubImpl[package=a.b.c.topLevelMembersAnnotated] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=d] REFERENCE_EXPRESSION:[referencedName=e] REFERENCE_EXPRESSION:[referencedName=f] @@ -78,27 +78,27 @@ PsiJetFileStubImpl[package=a.b.c.topLevelMembersAnnotated] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=b] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=d] REFERENCE_EXPRESSION:[referencedName=e] REFERENCE_EXPRESSION:[referencedName=f] REFERENCE_EXPRESSION:[referencedName=b] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=b] REFERENCE_EXPRESSION:[referencedName=c] REFERENCE_EXPRESSION:[referencedName=topLevelMembersAnnotated] REFERENCE_EXPRESSION:[referencedName=C] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt index 9ad56b6e32e..7aecfedc532 100644 --- a/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt +++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt @@ -7,50 +7,50 @@ PsiJetFileStubImpl[package=foo.TopLevelMembers] PROPERTY:[fqName=foo.TopLevelMembers.certainlyNothing, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=certainlyNothing] MODIFIER_LIST:[private] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Nothing] PROPERTY:[fqName=foo.TopLevelMembers.immutable, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=immutable] MODIFIER_LIST:[public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Double] PROPERTY:[fqName=foo.TopLevelMembers.mutable, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=true, name=mutable] MODIFIER_LIST:[public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Float] PROPERTY:[fqName=foo.TopLevelMembers.ext, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=true, isVar=false, name=ext] MODIFIER_LIST:[public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=foo.TopLevelMembers.funWithExprBody, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithExprBody] MODIFIER_LIST:[private] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] FUN:[fqName=foo.TopLevelMembers.funWithParams, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithParams] @@ -58,13 +58,13 @@ PsiJetFileStubImpl[package=foo.TopLevelMembers] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=foo.TopLevelMembers.funWithVarargParam, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithVarargParam] @@ -72,48 +72,48 @@ PsiJetFileStubImpl[package=foo.TopLevelMembers] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=v] MODIFIER_LIST:[vararg] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] FUN:[fqName=foo.TopLevelMembers.probablyNothing, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=probablyNothing] MODIFIER_LIST:[private] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=foo] REFERENCE_EXPRESSION:[referencedName=TopLevelMembers] REFERENCE_EXPRESSION:[referencedName=Nothing] FUN:[fqName=foo.TopLevelMembers.ext, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=true, isTopLevel=true, name=ext] MODIFIER_LIST:[public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt index e502f29a5d4..39badd60be7 100644 --- a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt +++ b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt @@ -8,14 +8,14 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=H] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Any] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=C] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=T] PRIMARY_CONSTRUCTOR: @@ -24,46 +24,46 @@ PsiJetFileStubImpl[package=test] SUPER_TYPE_LIST: SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=A] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=T] TYPE_CONSTRAINT_LIST: TYPE_CONSTRAINT: REFERENCE_EXPRESSION:[referencedName=H] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=List] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_CONSTRAINT: REFERENCE_EXPRESSION:[referencedName=G] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=CharSequence] TYPE_CONSTRAINT: REFERENCE_EXPRESSION:[referencedName=C] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Any] CLASS_BODY: diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt index 5d3c6056ce3..18b0fe7e8f5 100644 --- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt +++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt @@ -8,15 +8,15 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER:[fqName=null, isInVariance=true, isOutVariance=false, name=T1] MODIFIER_LIST:[in] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Any] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=true, name=T2] MODIFIER_LIST:[out] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T3] @@ -25,24 +25,24 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T4] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T5] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T6] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T5] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T7] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T6] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -52,16 +52,16 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=T1] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Cloneable] TYPE_CONSTRAINT: REFERENCE_EXPRESSION:[referencedName=T1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=java] REFERENCE_EXPRESSION:[referencedName=io] REFERENCE_EXPRESSION:[referencedName=Serializable] @@ -69,7 +69,7 @@ PsiJetFileStubImpl[package=test] PROPERTY:[fqName=test.TypeParams.useSomeParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=useSomeParam] MODIFIER_LIST:[public final] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T2] PROPERTY:[fqName=test.TypeParams.withOwnBoundedParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=false, isVar=false, name=withOwnBoundedParam] MODIFIER_LIST:[public final] @@ -77,38 +77,38 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G1] PROPERTY:[fqName=test.TypeParams.withOwnBoundedParamByOther, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=false, isVar=false, name=withOwnBoundedParamByOther] MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T4] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G1] PROPERTY:[fqName=test.TypeParams.withOwnParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=false, isVar=false, name=withOwnParam] MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G1] FUN:[fqName=test.TypeParams.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=true, isExtension=false, isTopLevel=false, name=f] MODIFIER_LIST:[public final inline] @@ -120,7 +120,7 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=g] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=body] TYPE_REFERENCE: @@ -128,20 +128,20 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T] FUN:[fqName=test.TypeParams.useParams, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=useParams] MODIFIER_LIST:[public final] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T1] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2] TYPE_REFERENCE: @@ -149,28 +149,28 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T3] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T4] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=P5] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T5] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -178,27 +178,27 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T3] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T3] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T1] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T5] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=P5] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -206,22 +206,22 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=List] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T1] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=Map] @@ -229,35 +229,35 @@ PsiJetFileStubImpl[package=test] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T4] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T5] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3] TYPE_REFERENCE: FUNCTION_TYPE: FUNCTION_TYPE_RECEIVER: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T4] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T2] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T3] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -269,19 +269,19 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G1] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G2] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G3] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T1] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p5] TYPE_REFERENCE: @@ -289,16 +289,16 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -307,34 +307,34 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G1] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G3] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G4] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G1] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G1] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G2] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G3] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T1] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p5] TYPE_REFERENCE: @@ -342,16 +342,16 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] TYPE_CONSTRAINT_LIST: @@ -359,9 +359,9 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=G3] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=java] REFERENCE_EXPRESSION:[referencedName=io] REFERENCE_EXPRESSION:[referencedName=Serializable] @@ -374,27 +374,27 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T1] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T2] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T3] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T4] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p5] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T5] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -402,15 +402,15 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T1] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T1] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] diff --git a/idea/testData/decompiler/stubBuilder/Types/Types.txt b/idea/testData/decompiler/stubBuilder/Types/Types.txt index dcf6dfd7b20..7c6314fcf96 100644 --- a/idea/testData/decompiler/stubBuilder/Types/Types.txt +++ b/idea/testData/decompiler/stubBuilder/Types/Types.txt @@ -14,8 +14,8 @@ PsiJetFileStubImpl[package=test] FUNCTION_TYPE: FUNCTION_TYPE_RECEIVER: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] VALUE_PARAMETER_LIST: @@ -25,27 +25,27 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=List] @@ -53,8 +53,8 @@ PsiJetFileStubImpl[package=test] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -63,20 +63,20 @@ PsiJetFileStubImpl[package=test] FUNCTION_TYPE: FUNCTION_TYPE_RECEIVER: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -85,23 +85,23 @@ PsiJetFileStubImpl[package=test] FUNCTION_TYPE: FUNCTION_TYPE_RECEIVER: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=List] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -110,30 +110,30 @@ PsiJetFileStubImpl[package=test] FUNCTION_TYPE: FUNCTION_TYPE_RECEIVER: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=List] @@ -141,8 +141,8 @@ PsiJetFileStubImpl[package=test] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -151,50 +151,50 @@ PsiJetFileStubImpl[package=test] FUNCTION_TYPE: FUNCTION_TYPE_RECEIVER: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=List] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Function1] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=STAR] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -203,8 +203,8 @@ PsiJetFileStubImpl[package=test] FUNCTION_TYPE: VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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] @@ -214,52 +214,52 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=List] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=List] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=List] @@ -269,12 +269,12 @@ PsiJetFileStubImpl[package=test] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=ExtensionFunctionType] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=ExtensionFunctionType] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Function1] TYPE_ARGUMENT_LIST: @@ -283,40 +283,40 @@ PsiJetFileStubImpl[package=test] PROPERTY:[fqName=test.Types.map, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=map] MODIFIER_LIST:[abstract public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=Map] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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:[public final] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=Map] @@ -324,23 +324,23 @@ PsiJetFileStubImpl[package=test] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_PROJECTION:[projectionKind=NONE] TYPE_REFERENCE: NULLABLE_TYPE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=Map] @@ -348,22 +348,22 @@ PsiJetFileStubImpl[package=test] TYPE_PROJECTION:[projectionKind=IN] MODIFIER_LIST:[in] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_PROJECTION:[projectionKind=OUT] MODIFIER_LIST:[out] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: 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 public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Function1] TYPE_ARGUMENT_LIST: @@ -372,9 +372,9 @@ PsiJetFileStubImpl[package=test] PROPERTY:[fqName=test.Types.starList, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=starList] MODIFIER_LIST:[abstract public] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=collections] REFERENCE_EXPRESSION:[referencedName=List] @@ -392,22 +392,22 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=P1] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=P2] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=P3] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=R] VALUE_PARAMETER_LIST: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] diff --git a/idea/testData/stubs/AnnotationOnClass.expected b/idea/testData/stubs/AnnotationOnClass.expected index 5dd56933b58..b23cc0554fe 100644 --- a/idea/testData/stubs/AnnotationOnClass.expected +++ b/idea/testData/stubs/AnnotationOnClass.expected @@ -6,6 +6,6 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Deprecated] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Deprecated] CLASS_BODY: diff --git a/idea/testData/stubs/AnnotationOnFunction.expected b/idea/testData/stubs/AnnotationOnFunction.expected index 7bb735c7d55..5aa1d903283 100644 --- a/idea/testData/stubs/AnnotationOnFunction.expected +++ b/idea/testData/stubs/AnnotationOnFunction.expected @@ -6,6 +6,6 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Deprecated] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Deprecated] VALUE_PARAMETER_LIST: diff --git a/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected b/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected index 7a2458033f4..618a9fc6008 100644 --- a/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected +++ b/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected @@ -8,17 +8,17 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Deprecated] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Deprecated] ANNOTATION: ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Override] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Override] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Deprecated] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Deprecated] VALUE_PARAMETER_LIST: diff --git a/idea/testData/stubs/AnonymousObject.expected b/idea/testData/stubs/AnonymousObject.expected index 7eb5568ad57..dbb0803b153 100644 --- a/idea/testData/stubs/AnonymousObject.expected +++ b/idea/testData/stubs/AnonymousObject.expected @@ -9,10 +9,10 @@ PsiJetFileStubImpl[package=] SUPER_TYPE_CALL_ENTRY: CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=A] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T] CLASS_BODY: diff --git a/idea/testData/stubs/ClassObject.expected b/idea/testData/stubs/ClassObject.expected index b7ec6d3907a..9dec3e718c6 100644 --- a/idea/testData/stubs/ClassObject.expected +++ b/idea/testData/stubs/ClassObject.expected @@ -15,5 +15,5 @@ PsiJetFileStubImpl[package=] CLASS_BODY: PROPERTY:[fqName=D.Named.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/stubs/ClassProperty.expected b/idea/testData/stubs/ClassProperty.expected index d042844a114..8cf122d7868 100644 --- a/idea/testData/stubs/ClassProperty.expected +++ b/idea/testData/stubs/ClassProperty.expected @@ -6,5 +6,5 @@ PsiJetFileStubImpl[package=] PROPERTY:[fqName=More.test, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=test] MODIFIER_LIST:[private] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/stubs/DanglingAnnotations.expected b/idea/testData/stubs/DanglingAnnotations.expected index cb57d273961..8fe37d1cd86 100644 --- a/idea/testData/stubs/DanglingAnnotations.expected +++ b/idea/testData/stubs/DanglingAnnotations.expected @@ -8,12 +8,12 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Ann] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Ann] MODIFIER_LIST:[] ANNOTATION: ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Ann] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Ann] diff --git a/idea/testData/stubs/FunctionParameters.expected b/idea/testData/stubs/FunctionParameters.expected index aa2fa15577e..b3ea450e0ac 100644 --- a/idea/testData/stubs/FunctionParameters.expected +++ b/idea/testData/stubs/FunctionParameters.expected @@ -5,9 +5,9 @@ PsiJetFileStubImpl[package=] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=t] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=null, hasDefaultValue=true, hasValOrVar=false, isMutable=false, name=other] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=String] diff --git a/idea/testData/stubs/LocalClass.expected b/idea/testData/stubs/LocalClass.expected index 064b5d42b07..04f6cbd8f2e 100644 --- a/idea/testData/stubs/LocalClass.expected +++ b/idea/testData/stubs/LocalClass.expected @@ -10,9 +10,9 @@ PsiJetFileStubImpl[package=] SUPER_TYPE_CALL_ENTRY: CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=A] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T] diff --git a/idea/testData/stubs/LocalClassInLocalFunction.expected b/idea/testData/stubs/LocalClassInLocalFunction.expected index 064b5d42b07..04f6cbd8f2e 100644 --- a/idea/testData/stubs/LocalClassInLocalFunction.expected +++ b/idea/testData/stubs/LocalClassInLocalFunction.expected @@ -10,9 +10,9 @@ PsiJetFileStubImpl[package=] SUPER_TYPE_CALL_ENTRY: CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=A] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T] diff --git a/idea/testData/stubs/LocalNamedObject.expected b/idea/testData/stubs/LocalNamedObject.expected index cc5e34c4e3b..1cc54be2f3f 100644 --- a/idea/testData/stubs/LocalNamedObject.expected +++ b/idea/testData/stubs/LocalNamedObject.expected @@ -10,9 +10,9 @@ PsiJetFileStubImpl[package=] SUPER_TYPE_CALL_ENTRY: CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=A] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T] diff --git a/idea/testData/stubs/ManyAnnotationsOnFunction.expected b/idea/testData/stubs/ManyAnnotationsOnFunction.expected index 7f28d3f47da..03cb2800841 100644 --- a/idea/testData/stubs/ManyAnnotationsOnFunction.expected +++ b/idea/testData/stubs/ManyAnnotationsOnFunction.expected @@ -7,15 +7,15 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Deprecated] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=java] REFERENCE_EXPRESSION:[referencedName=lang] REFERENCE_EXPRESSION:[referencedName=Deprecated] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Override] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Override] VALUE_PARAMETER_LIST: diff --git a/idea/testData/stubs/MembersInLocalClass.expected b/idea/testData/stubs/MembersInLocalClass.expected index 01e90ede95d..fbf728ad0f7 100644 --- a/idea/testData/stubs/MembersInLocalClass.expected +++ b/idea/testData/stubs/MembersInLocalClass.expected @@ -9,5 +9,5 @@ PsiJetFileStubImpl[package=] VALUE_PARAMETER_LIST: PROPERTY:[fqName=null, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/stubs/MembersInLocalObject.expected b/idea/testData/stubs/MembersInLocalObject.expected index 927d9f80726..791d8ec86e2 100644 --- a/idea/testData/stubs/MembersInLocalObject.expected +++ b/idea/testData/stubs/MembersInLocalObject.expected @@ -9,5 +9,5 @@ PsiJetFileStubImpl[package=] VALUE_PARAMETER_LIST: PROPERTY:[fqName=null, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=foo] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/stubs/NamedObject.expected b/idea/testData/stubs/NamedObject.expected index c27721bc813..a536f38a01b 100644 --- a/idea/testData/stubs/NamedObject.expected +++ b/idea/testData/stubs/NamedObject.expected @@ -8,10 +8,10 @@ PsiJetFileStubImpl[package=] SUPER_TYPE_CALL_ENTRY: CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=A] SUPER_TYPE_ENTRY: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T] CLASS_BODY: diff --git a/idea/testData/stubs/NotStorePropertyFromInitializer.expected b/idea/testData/stubs/NotStorePropertyFromInitializer.expected index bb910f73734..54834e8d302 100644 --- a/idea/testData/stubs/NotStorePropertyFromInitializer.expected +++ b/idea/testData/stubs/NotStorePropertyFromInitializer.expected @@ -3,6 +3,6 @@ PsiJetFileStubImpl[package=] IMPORT_LIST: FUN:[fqName=some, hasBlockBody=false, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=true, isTopLevel=true, name=some] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=DoubleArray] VALUE_PARAMETER_LIST: diff --git a/idea/testData/stubs/ObjectInInitializer.expected b/idea/testData/stubs/ObjectInInitializer.expected index 6e8653365d2..904d9a42f92 100644 --- a/idea/testData/stubs/ObjectInInitializer.expected +++ b/idea/testData/stubs/ObjectInInitializer.expected @@ -8,5 +8,5 @@ PsiJetFileStubImpl[package=] VALUE_PARAMETER_LIST: PROPERTY:[fqName=null, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=p] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/stubs/ObjectInPropertyDelegate.expected b/idea/testData/stubs/ObjectInPropertyDelegate.expected index bc31ac06e24..913cab21eac 100644 --- a/idea/testData/stubs/ObjectInPropertyDelegate.expected +++ b/idea/testData/stubs/ObjectInPropertyDelegate.expected @@ -8,5 +8,5 @@ PsiJetFileStubImpl[package=] VALUE_PARAMETER_LIST: PROPERTY:[fqName=null, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=p] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] diff --git a/idea/testData/stubs/ParametersWithFqName.expected b/idea/testData/stubs/ParametersWithFqName.expected index dffadba6c46..df971c0d797 100644 --- a/idea/testData/stubs/ParametersWithFqName.expected +++ b/idea/testData/stubs/ParametersWithFqName.expected @@ -7,14 +7,14 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=test.A.b, hasDefaultValue=false, hasValOrVar=true, isMutable=false, name=b] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] VALUE_PARAMETER:[fqName=test.A.c, hasDefaultValue=false, hasValOrVar=true, isMutable=true, name=c] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=String] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=justParam] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] CLASS_BODY: diff --git a/idea/testData/stubs/QualifiedAnnotationOnFunction.expected b/idea/testData/stubs/QualifiedAnnotationOnFunction.expected index d18ce973e44..fc7747e621c 100644 --- a/idea/testData/stubs/QualifiedAnnotationOnFunction.expected +++ b/idea/testData/stubs/QualifiedAnnotationOnFunction.expected @@ -6,9 +6,9 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Deprecated] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: + USER_TYPE: + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=java] REFERENCE_EXPRESSION:[referencedName=lang] REFERENCE_EXPRESSION:[referencedName=Deprecated] diff --git a/idea/testData/stubs/SecondaryConstructors.expected b/idea/testData/stubs/SecondaryConstructors.expected index 3898ed4d59d..dbbb51fb9ce 100644 --- a/idea/testData/stubs/SecondaryConstructors.expected +++ b/idea/testData/stubs/SecondaryConstructors.expected @@ -7,7 +7,7 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Boolean] CLASS_BODY: CLASS_INITIALIZER: @@ -16,12 +16,12 @@ PsiJetFileStubImpl[package=test] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=anno] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=anno] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=String] CLASS_INITIALIZER: SECONDARY_CONSTRUCTOR: @@ -29,35 +29,35 @@ PsiJetFileStubImpl[package=test] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] CLASS:[fqName=test.SecondaryConstructors.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] MODIFIER_LIST:[inner] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=String] TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] TYPE_CONSTRAINT_LIST: TYPE_CONSTRAINT: REFERENCE_EXPRESSION:[referencedName=G] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Number] CLASS_BODY: SECONDARY_CONSTRUCTOR: VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=T] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=g] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=G] CLASS:[fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] CLASS_BODY: @@ -66,12 +66,12 @@ PsiJetFileStubImpl[package=test] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=anno] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=anno] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=z] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Int] SECONDARY_CONSTRUCTOR: MODIFIER_LIST:[internal] diff --git a/idea/testData/stubs/StarProjection.expected b/idea/testData/stubs/StarProjection.expected index 588f90d9652..e44b9d70905 100644 --- a/idea/testData/stubs/StarProjection.expected +++ b/idea/testData/stubs/StarProjection.expected @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST: PROPERTY:[fqName=v, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=v] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Foo] TYPE_ARGUMENT_LIST: TYPE_PROJECTION:[projectionKind=STAR] diff --git a/idea/testData/stubs/TypeAnnotation.expected b/idea/testData/stubs/TypeAnnotation.expected index ecf82fcfa4f..51e0990809c 100644 --- a/idea/testData/stubs/TypeAnnotation.expected +++ b/idea/testData/stubs/TypeAnnotation.expected @@ -9,7 +9,7 @@ PsiJetFileStubImpl[package=] VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=b.e, hasDefaultValue=false, hasValOrVar=true, isMutable=false, name=e] TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=E] CLASS:[fqName=E, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=E, superNames=[]] MODIFIER_LIST:[enum] @@ -24,28 +24,28 @@ PsiJetFileStubImpl[package=] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] ANNOTATION: ANNOTATION_ENTRY:[hasValueArguments=true, shortName=b] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=b] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=DoubleRange] TYPE_REFERENCE: ANNOTATION: ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=a] ANNOTATION: ANNOTATION_ENTRY:[hasValueArguments=true, shortName=b] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=b] - USER_TYPE:[isAbsoluteInRootPackage=false] + USER_TYPE: REFERENCE_EXPRESSION:[referencedName=Unit]