From 76a3f23df01da485bf0deaffc7981259d1183cf4 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 2 Oct 2018 15:04:05 +0300 Subject: [PATCH] Test for stubs of extension/non-extension properties with same name (KT-27274) An issue was probably fixed in 98232265d71e001be886d71b4913cc133bf128c8 #KT-27274 Fixed --- .../TopLevelMembersKt/TopLevelMembers.kt | 9 +++++ .../TopLevelMembersKt/TopLevelMembersKt.txt | 37 +++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembers.kt b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembers.kt index 015b207ef0a..3b9ae59b162 100644 --- a/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembers.kt +++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembers.kt @@ -27,3 +27,12 @@ private val certainlyNothing: kotlin.Nothing = throw IllegalStateException() private typealias Alias = (E) -> E class Nothing + +@Target(AnnotationTarget.FIELD) +annotation class A + +class D + +public val D.Main: D? get() = null + +@A internal val Main: D? = null diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt index bfe0405ab46..4695f5ef7b4 100644 --- a/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt +++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt @@ -4,6 +4,26 @@ PsiJetFileStubImpl[package=foo.TopLevelMembers] REFERENCE_EXPRESSION[referencedName=foo] REFERENCE_EXPRESSION[referencedName=TopLevelMembers] IMPORT_LIST + PROPERTY[fqName=foo.TopLevelMembers.Main, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=true, isVar=false, name=Main] + MODIFIER_LIST[internal] + ANNOTATION_ENTRY[hasValueArguments=false, shortName=A] + ANNOTATION_TARGET[useSiteTarget=FIELD] + CONSTRUCTOR_CALLEE + TYPE_REFERENCE + USER_TYPE + USER_TYPE + USER_TYPE + REFERENCE_EXPRESSION[referencedName=foo] + REFERENCE_EXPRESSION[referencedName=TopLevelMembers] + REFERENCE_EXPRESSION[referencedName=A] + TYPE_REFERENCE + NULLABLE_TYPE + USER_TYPE + USER_TYPE + USER_TYPE + REFERENCE_EXPRESSION[referencedName=foo] + REFERENCE_EXPRESSION[referencedName=TopLevelMembers] + REFERENCE_EXPRESSION[referencedName=D] 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 @@ -25,6 +45,23 @@ PsiJetFileStubImpl[package=foo.TopLevelMembers] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Float] + PROPERTY[fqName=foo.TopLevelMembers.Main, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=true, isVar=false, name=Main] + MODIFIER_LIST[public] + TYPE_REFERENCE + USER_TYPE + USER_TYPE + USER_TYPE + REFERENCE_EXPRESSION[referencedName=foo] + REFERENCE_EXPRESSION[referencedName=TopLevelMembers] + REFERENCE_EXPRESSION[referencedName=D] + TYPE_REFERENCE + NULLABLE_TYPE + USER_TYPE + USER_TYPE + USER_TYPE + REFERENCE_EXPRESSION[referencedName=foo] + REFERENCE_EXPRESSION[referencedName=TopLevelMembers] + REFERENCE_EXPRESSION[referencedName=D] 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