[NI] Don't apply SAM-conversion for type that is subtype of function

Plus, don't get synthetic candidates as all candidates are creating
 by conversion

 #KT-31503 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2019-05-24 17:23:02 +03:00
parent ceaa64dfb1
commit fe5976d7f4
9 changed files with 76 additions and 13 deletions
@@ -60,8 +60,7 @@ class SamAdapterFunctionsScope(
private val deprecationResolver: DeprecationResolver,
private val lookupTracker: LookupTracker
) : SyntheticScope.Default() {
private val samViaSyntheticScopeDisabled = languageVersionSettings.supportsFeature(LanguageFeature.NewInference) &&
languageVersionSettings.supportsFeature(LanguageFeature.SamConversionForKotlinFunctions)
private val samViaSyntheticScopeDisabled = languageVersionSettings.supportsFeature(LanguageFeature.NewInference)
private val extensionForFunction =
storageManager.createMemoizedFunctionWithNullableValues<FunctionDescriptor, FunctionDescriptor> { function ->