azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LL API] Minor, clean up 'LLLibraryScopeAwareConeCallConflictResolver'

Browse Source
This commit is contained in:
Yan Zhulanow
2023-08-29 17:57:39 +09:00
committed by Space Team
parent 4c3d414067
commit faaba52ed5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/extensions/LLLibraryScopeAwareConeCallConflictResolver.kt
+4 -4
View File
@@ -37,12 +37,12 @@ private class LLLibraryScopeAwareConeCallConflictResolver(
private val bodyResolveComponents: BodyResolveComponents private val bodyResolveComponents: BodyResolveComponents
) : ConeCallConflictResolver() { ) : ConeCallConflictResolver() {
override fun chooseMaximallySpecificCandidates(candidates: Set<Candidate>, discriminateAbstracts: Boolean): Set<Candidate> { override fun chooseMaximallySpecificCandidates(candidates: Set<Candidate>, discriminateAbstracts: Boolean): Set<Candidate> {
if (candidates.size > 1 && bodyResolveComponents.file.psi is KtCodeFragment) { val filteredCandidates = when {
val filteredCandidates = filterCodeFragmentCandidates(candidates) candidates.size > 1 && bodyResolveComponents.file.psi is KtCodeFragment -> filterCodeFragmentCandidates(candidates)
return delegate.chooseMaximallySpecificCandidates(filteredCandidates, discriminateAbstracts) 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). // In complex projects, there might be several library copies (with the same or different versions).