diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt index bcfe80f1709..1f74501bf57 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt @@ -85,6 +85,7 @@ fun KtParameter.toPsiParameters(): Collection { val paramList = getNonStrictParentOfType() ?: return emptyList() val paramIndex = paramList.parameters.indexOf(this) + if (paramIndex < 0) return emptyList() val owner = paramList.parent val lightParamIndex = if (owner is KtDeclaration && owner.isExtensionDeclaration()) paramIndex + 1 else paramIndex @@ -95,9 +96,7 @@ fun KtParameter.toPsiParameters(): Collection { else -> null } ?: return emptyList() - return methods.mapNotNull { - if (it.parameterList.parametersCount > lightParamIndex) it.parameterList.parameters[lightParamIndex] else null - } + return methods.mapNotNull { it.parameterList.parameters.getOrNull(lightParamIndex) } } private fun KtParameter.toAnnotationLightMethod(): PsiMethod? {