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

Don't propagate compatibility resolve from callable reference arguments

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2020-06-01 09:26:09 +03:00
parent 599f520fd8
commit f922e454f9
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CallableReferenceResolver.kt
+2
View File
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemBuilder
import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemOperation import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemOperation
import org.jetbrains.kotlin.resolve.calls.inference.components.ConstraintInjector import org.jetbrains.kotlin.resolve.calls.inference.components.ConstraintInjector
import org.jetbrains.kotlin.resolve.calls.inference.components.NewTypeSubstitutor import org.jetbrains.kotlin.resolve.calls.inference.components.NewTypeSubstitutor
import org.jetbrains.kotlin.resolve.calls.inference.model.LowerPriorityToPreserveCompatibility
import org.jetbrains.kotlin.resolve.calls.model.* import org.jetbrains.kotlin.resolve.calls.model.*
import org.jetbrains.kotlin.resolve.calls.results.FlatSignature import org.jetbrains.kotlin.resolve.calls.results.FlatSignature
import org.jetbrains.kotlin.resolve.calls.results.OverloadingConflictResolver import org.jetbrains.kotlin.resolve.calls.results.OverloadingConflictResolver
@@ -109,6 +110,7 @@ class CallableReferenceResolver(
chosenCandidate.diagnostics.forEach { chosenCandidate.diagnostics.forEach {
val transformedDiagnostic = when (it) { val transformedDiagnostic = when (it) {
is CompatibilityWarning -> CompatibilityWarningOnArgument(argument) is CompatibilityWarning -> CompatibilityWarningOnArgument(argument)
is LowerPriorityToPreserveCompatibility -> return@forEach
else -> it else -> it
} }
diagnosticsHolder.addDiagnostic(transformedDiagnostic) diagnosticsHolder.addDiagnostic(transformedDiagnostic)