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

[decompiler] navigate to containing class for fake object descriptors

Browse Source 
^ KTIJ-25661
This commit is contained in:
Anna Kozlova
2023-05-30 09:23:56 +02:00
committed by Space Team
parent 793e3552e7
commit b8e868caf6
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/text/ByDescriptorIndexer.kt
+5
View File
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.psi.psiUtil.hasSuspendModifier
import org.jetbrains.kotlin.psi.psiUtil.unwrapNullability import org.jetbrains.kotlin.psi.psiUtil.unwrapNullability
import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject
import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
import org.jetbrains.kotlin.types.AbbreviatedType import org.jetbrains.kotlin.types.AbbreviatedType
@@ -57,6 +58,10 @@ object ByDescriptorIndexer {
return getDeclarationForDescriptor(original.containingDeclaration, file) return getDeclarationForDescriptor(original.containingDeclaration, file)
} }
if (original is FakeCallableDescriptorForObject) {
return getDeclarationForDescriptor(original.classDescriptor, file)
}
if (original is MemberDescriptor) { if (original is MemberDescriptor) {
val declarationContainer: KtDeclarationContainer? = when { val declarationContainer: KtDeclarationContainer? = when {
DescriptorUtils.isTopLevelDeclaration(original) -> file DescriptorUtils.isTopLevelDeclaration(original) -> file