From 051310124b9b9b462eca3c89bef9ed21a50ef489 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 15 Apr 2021 16:39:25 +0200 Subject: [PATCH] FIR IDE: do not fail duplicating classes with members --- .../kotlin/idea/fir/low/level/api/util/declarationUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt index a3767f9196f..373b97d7e04 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt @@ -103,7 +103,7 @@ private fun KtDeclaration.findSourceNonLocalFirDeclarationByProvider( val containingClass = containingClassOrObject ?: error("Container class should be not null for KtConstructor") val containerClassFir = containingClass.findFir(firSymbolProvider) ?: return null - containerClassFir.declarations.first { it.psi === this } + containerClassFir.declarations.firstOrNull { it.psi === this } } this is KtTypeAlias -> findFir(firSymbolProvider) else -> error("Invalid container ${this::class}\n${getElementTextInContext()}")