From faaba52ed536b7d634a32e191881b4de034d56ef Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 29 Aug 2023 17:57:39 +0900 Subject: [PATCH] [LL API] Minor, clean up 'LLLibraryScopeAwareConeCallConflictResolver' --- .../LLLibraryScopeAwareConeCallConflictResolver.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/extensions/LLLibraryScopeAwareConeCallConflictResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/extensions/LLLibraryScopeAwareConeCallConflictResolver.kt index 2780713797b..5a3ec70b918 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/extensions/LLLibraryScopeAwareConeCallConflictResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/extensions/LLLibraryScopeAwareConeCallConflictResolver.kt @@ -37,12 +37,12 @@ private class LLLibraryScopeAwareConeCallConflictResolver( private val bodyResolveComponents: BodyResolveComponents ) : ConeCallConflictResolver() { override fun chooseMaximallySpecificCandidates(candidates: Set, discriminateAbstracts: Boolean): Set { - if (candidates.size > 1 && bodyResolveComponents.file.psi is KtCodeFragment) { - val filteredCandidates = filterCodeFragmentCandidates(candidates) - return delegate.chooseMaximallySpecificCandidates(filteredCandidates, discriminateAbstracts) + val filteredCandidates = when { + candidates.size > 1 && bodyResolveComponents.file.psi is KtCodeFragment -> filterCodeFragmentCandidates(candidates) + else -> candidates } - return delegate.chooseMaximallySpecificCandidates(candidates, discriminateAbstracts) + return delegate.chooseMaximallySpecificCandidates(filteredCandidates, discriminateAbstracts) } // In complex projects, there might be several library copies (with the same or different versions).