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

Reverted old behaviour of DescriptorToSourceUtils.descriptorToDeclaration()

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2015-03-04 18:28:02 +03:00
parent e7796fbb58
commit 0bc8efa20d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.kt
+3 -8
View File
@@ -59,17 +59,12 @@ public object DescriptorToSourceUtils {
// NOTE this is also used by KDoc // NOTE this is also used by KDoc
// Returns PSI element for descriptor. If there are many relevant elements (e.g. it is fake override // Returns PSI element for descriptor. If there are many relevant elements (e.g. it is fake override
// with multiple declarations), finds any of them. It can't find declarations in builtins or decompiled code. // with multiple declarations), returns null. It can't find declarations in builtins or decompiled code.
// In IDE, use DescriptorToSourceUtilsIde instead. // In IDE, use DescriptorToSourceUtilsIde instead.
platformStatic platformStatic
public fun descriptorToDeclaration(descriptor: DeclarationDescriptor): PsiElement? { public fun descriptorToDeclaration(descriptor: DeclarationDescriptor): PsiElement? {
for (declarationDescriptor in getEffectiveReferencedDescriptors(descriptor.getOriginal())) { val effectiveReferencedDescriptors = getEffectiveReferencedDescriptors(descriptor)
val source = getSourceFromDescriptor(declarationDescriptor) return if (effectiveReferencedDescriptors.size() == 1) getSourceFromDescriptor(effectiveReferencedDescriptors.firstOrNull()!!) else null
if (source != null) {
return source
}
}
return null
} }
platformStatic platformStatic