From b7711678c276a2fd65c1e501c943d1dc6f13286a Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 5 Dec 2019 18:22:56 +0300 Subject: [PATCH] EA-218474: fix IAE in resolving empty fqName in new J2K --- .../org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt index 45c392fc4e1..aac5a041bbc 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt @@ -71,13 +71,15 @@ class JKResolver(val project: Project, module: Module?, private val contextEleme KotlinTopLevelPropertyFqnNameIndex.getInstance()[fqName.asString(), project, scope].firstOrNull() - private fun resolveFqName(fqName: FqName): PsiElement? = - constructImportDirectiveWithContext(fqName) + private fun resolveFqName(fqName: FqName): PsiElement? { + if (fqName.isRoot) return null + return constructImportDirectiveWithContext(fqName) .getChildOfType() ?.selectorExpression ?.let { it.references.mapNotNull { it.resolve() }.firstOrNull() } + } private fun constructImportDirectiveWithContext(fqName: FqName): KtImportDirective {