From f1f2c7cce5cd9703269b49dbf0ebbe9119d02da1 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Mon, 21 Feb 2022 18:41:21 +0300 Subject: [PATCH] FIR IDE: Small fixes --- .../kotlin/analysis/api/fir/KtFirAnalysisSessionProvider.kt | 1 - .../low/level/api/fir/file/structure/FileStructureElement.kt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSessionProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSessionProvider.kt index 2efcc43d38a..506089075fe 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSessionProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSessionProvider.kt @@ -26,7 +26,6 @@ class KtFirAnalysisSessionProvider(project: Project) : CachingKtAnalysisSessionP override fun getResolveState(contextSymbol: KtSymbol): LLFirModuleResolveState { return when (contextSymbol) { is KtFirSymbol<*> -> contextSymbol.resolveState - is KtFirBackingFieldSymbol -> contextSymbol.resolveState else -> error("Invalid symbol ${contextSymbol::class}") } } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt index 1607542dfed..2a174702c36 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt @@ -43,7 +43,7 @@ internal class KtToFirMapping(firElement: FirElement, recorder: FirElementsRecor val userType = when (ktElement) { is KtUserType -> ktElement - is KtNameReferenceExpression -> ktElement as? KtUserType + is KtNameReferenceExpression -> ktElement.parent as? KtUserType else -> null } ?: return null