From 3525ddaf12377d42dfd3118eb1b8daaa1f22bb45 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 18 Apr 2022 21:09:33 +0200 Subject: [PATCH] [analysis api fir] fix resolving of compiled type alias ^KT-50868 fixed --- .../api/fir/util/FirDeclarationForCompiledElementSearcher.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirDeclarationForCompiledElementSearcher.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirDeclarationForCompiledElementSearcher.kt index 9170f8dfbfd..8573adce007 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirDeclarationForCompiledElementSearcher.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirDeclarationForCompiledElementSearcher.kt @@ -24,7 +24,7 @@ internal class FirDeclarationForCompiledElementSearcher(private val symbolProvid fun findNonLocalDeclaration(ktDeclaration: KtDeclaration): FirDeclaration { return when (ktDeclaration) { is KtEnumEntry -> findNonLocalEnumEntry(ktDeclaration) - is KtClassOrObject -> findNonLocalClass(ktDeclaration) + is KtClassLikeDeclaration -> findNonLocalClassLikeDeclaration(ktDeclaration) is KtConstructor<*> -> findConstructorOfNonLocalClass(ktDeclaration) is KtNamedFunction -> findNonLocalFunction(ktDeclaration) is KtProperty -> findNonLocalProperty(ktDeclaration) @@ -46,8 +46,7 @@ internal class FirDeclarationForCompiledElementSearcher(private val symbolProvid } as FirEnumEntry } - private fun findNonLocalClass(declaration: KtClassOrObject): FirClassLikeDeclaration { - require(!declaration.isLocal) + private fun findNonLocalClassLikeDeclaration(declaration: KtClassLikeDeclaration): FirClassLikeDeclaration { val classId = declaration.getClassId() ?: error("Non-local class should have classId. The class is ${declaration.getElementTextInContext()}")