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

EA-64906 - NPE: KdocPackage$KDocReference$c.getParamDescriptors

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-02-19 14:01:00 +01:00
parent ce4b2db8f6
commit a030585566
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt
+4 -1
View File
@@ -102,7 +102,10 @@ public fun getParamDescriptors(fromDescriptor: DeclarationDescriptor): List<Decl
is ClassifierDescriptor -> { is ClassifierDescriptor -> {
val typeParams = fromDescriptor.getTypeConstructor().getParameters() val typeParams = fromDescriptor.getTypeConstructor().getParameters()
if (fromDescriptor is ClassDescriptor) { if (fromDescriptor is ClassDescriptor) {
return typeParams + fromDescriptor.getUnsubstitutedPrimaryConstructor().getValueParameters() val constructorDescriptor = fromDescriptor.getUnsubstitutedPrimaryConstructor()
if (constructorDescriptor != null) {
return typeParams + constructorDescriptor.getValueParameters()
}
} }
return typeParams return typeParams
} }