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

[NI] Support fallback resolution for refined sams priority feature

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-11-15 14:31:35 +03:00
parent e42f07b031
commit 66064345e9
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/KotlinCallResolver.kt
+10 -1
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.resolve.calls package org.jetbrains.kotlin.resolve.calls
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.resolve.calls.components.KotlinCallCompleter import org.jetbrains.kotlin.resolve.calls.components.KotlinCallCompleter
import org.jetbrains.kotlin.resolve.calls.components.KotlinResolutionCallbacks import org.jetbrains.kotlin.resolve.calls.components.KotlinResolutionCallbacks
import org.jetbrains.kotlin.resolve.calls.components.NewOverloadingConflictResolver import org.jetbrains.kotlin.resolve.calls.components.NewOverloadingConflictResolver
@@ -98,8 +99,16 @@ class KotlinCallResolver(
): CallResolutionResult { ): CallResolutionResult {
val isDebuggerContext = candidateFactory.scopeTower.isDebuggerContext val isDebuggerContext = candidateFactory.scopeTower.isDebuggerContext
var refinedCandidates = candidates
if (!callComponents.languageVersionSettings.supportsFeature(LanguageFeature.RefinedSamAdaptersPriority)) {
val nonSynthesized = candidates.filter { !it.resolvedCall.candidateDescriptor.isSynthesized }
if (!nonSynthesized.isEmpty()) {
refinedCandidates = nonSynthesized
}
}
val maximallySpecificCandidates = overloadingConflictResolver.chooseMaximallySpecificCandidates( val maximallySpecificCandidates = overloadingConflictResolver.chooseMaximallySpecificCandidates(
candidates, refinedCandidates,
CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS, CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS,
discriminateGenerics = true, // todo discriminateGenerics = true, // todo
isDebuggerContext = isDebuggerContext) isDebuggerContext = isDebuggerContext)