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

Refactoring: rename method to make it more specific

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2020-06-02 12:20:11 +03:00
parent 718f23b34f
commit 4bd622c1c5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CallableReferenceResolution.kt
+2 -2
View File
@@ -214,7 +214,7 @@ class CallableReferencesCandidateFactory(
callComponents.builtIns callComponents.builtIns
) )
if (needCompatibilityWarning(callableReferenceAdaptation, candidateDescriptor)) { if (needCompatibilityResolveForCallableReference(callableReferenceAdaptation, candidateDescriptor)) {
diagnostics.add(LowerPriorityToPreserveCompatibility) diagnostics.add(LowerPriorityToPreserveCompatibility)
} }
@@ -262,7 +262,7 @@ class CallableReferencesCandidateFactory(
) )
} }
private fun needCompatibilityWarning( private fun needCompatibilityResolveForCallableReference(
callableReferenceAdaptation: CallableReferenceAdaptation?, callableReferenceAdaptation: CallableReferenceAdaptation?,
candidate: CallableDescriptor candidate: CallableDescriptor
): Boolean { ): Boolean {
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/samConversionUtils.kt
+2 -2
View File
@@ -87,7 +87,7 @@ object SamTypeConversions : ParameterTypeConversion {
SamConversionDescription(convertedTypeByOriginal, convertedTypeByCandidate!!) SamConversionDescription(convertedTypeByOriginal, convertedTypeByCandidate!!)
) )
if (needCompatibilityResolve(candidate, expectedParameterType)) { if (needCompatibilityResolveForSAM(candidate, expectedParameterType)) {
candidate.addDiagnostic(LowerPriorityToPreserveCompatibility) candidate.addDiagnostic(LowerPriorityToPreserveCompatibility)
} }
@@ -99,7 +99,7 @@ object SamTypeConversions : ParameterTypeConversion {
return convertedTypeByCandidate return convertedTypeByCandidate
} }
private fun needCompatibilityResolve(candidate: KotlinResolutionCandidate, typeToConvert: UnwrappedType): Boolean { private fun needCompatibilityResolveForSAM(candidate: KotlinResolutionCandidate, typeToConvert: UnwrappedType): Boolean {
// fun interfaces is a new feature with a new modifier, so no compatibility resolve is needed // fun interfaces is a new feature with a new modifier, so no compatibility resolve is needed
val descriptor = typeToConvert.constructor.declarationDescriptor val descriptor = typeToConvert.constructor.declarationDescriptor
if (descriptor is ClassDescriptor && descriptor.isFun) return false if (descriptor is ClassDescriptor && descriptor.isFun) return false