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

[FIR] Improve condition for sorting equivalent calls by source first

Browse Source 
This accommodates for declarations generated by plugins that don't have
a source.
This commit is contained in:
Kirill Rakhman
2023-09-04 15:36:06 +02:00
committed by Space Team
parent 9ab6a5ff56
commit f08d4b8bb1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/ConeEquivalentCallConflictResolver.kt
+1 -1
View File
@@ -44,7 +44,7 @@ class ConeEquivalentCallConflictResolver(
// Since we can consider a declaration from source and one from binary equivalent, we need to make sure we favor the one from // Since we can consider a declaration from source and one from binary equivalent, we need to make sure we favor the one from
// source, otherwise we might get a behavior change to K1. // source, otherwise we might get a behavior change to K1.
// See org.jetbrains.kotlin.resolve.calls.results.OverloadingConflictResolver.filterOutEquivalentCalls. // See org.jetbrains.kotlin.resolve.calls.results.OverloadingConflictResolver.filterOutEquivalentCalls.
val fromSourceFirst = candidates.sortedBy { it.symbol.fir.source == null } val fromSourceFirst = candidates.sortedBy { it.symbol.fir.moduleData.session.kind != FirSession.Kind.Source }
val result = mutableSetOf<Candidate>() val result = mutableSetOf<Candidate>()
outerLoop@ for (myCandidate in fromSourceFirst) { outerLoop@ for (myCandidate in fromSourceFirst) {