From 7abb3fc98762650e16422561a53e2797d07606b1 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 17 Dec 2019 18:34:42 +0300 Subject: [PATCH] Protect FirJavaElementFinder from light tree --- .../src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt | 2 +- .../org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt.183 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt index ab0291912a5..7d498715225 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt @@ -68,7 +68,7 @@ class FirJavaElementFinder( firProvider.getFirClassifierByFqName(classId) as? FirRegularClass ?: return null - val ktFile = firClass.psi?.containingFile as KtFile + val ktFile = firClass.psi?.containingFile as? KtFile ?: return null val fileStub = createJavaFileStub(classId.packageFqName, listOf(ktFile)) return buildStub(firClass, fileStub).psi diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt.183 b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt.183 index df7a3aa9283..15723a66689 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt.183 +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt.183 @@ -68,7 +68,7 @@ class FirJavaElementFinder( firProvider.getFirClassifierByFqName(classId) as? FirRegularClass ?: return null - val ktFile = firClass.psi?.containingFile as KtFile + val ktFile = firClass.psi?.containingFile as? KtFile ?: return null val fileStub = createJavaFileStub(classId.packageFqName, listOf(ktFile)) return buildStub(firClass, fileStub).psi