From 4bd622c1c561d14b2aaa6a36d8a63d792a63d97b Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Tue, 2 Jun 2020 12:20:11 +0300
Subject: [PATCH] Refactoring: rename method to make it more specific

---
 .../resolve/calls/components/CallableReferenceResolution.kt   | 4 ++--
 .../kotlin/resolve/calls/components/samConversionUtils.kt     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CallableReferenceResolution.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CallableReferenceResolution.kt
index 912db11b04b..62ac5ae47e1 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CallableReferenceResolution.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CallableReferenceResolution.kt
@@ -214,7 +214,7 @@ class CallableReferencesCandidateFactory(
             callComponents.builtIns
         )
 
-        if (needCompatibilityWarning(callableReferenceAdaptation, candidateDescriptor)) {
+        if (needCompatibilityResolveForCallableReference(callableReferenceAdaptation, candidateDescriptor)) {
             diagnostics.add(LowerPriorityToPreserveCompatibility)
         }
 
@@ -262,7 +262,7 @@ class CallableReferencesCandidateFactory(
         )
     }
 
-    private fun needCompatibilityWarning(
+    private fun needCompatibilityResolveForCallableReference(
         callableReferenceAdaptation: CallableReferenceAdaptation?,
         candidate: CallableDescriptor
     ): Boolean {
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/samConversionUtils.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/samConversionUtils.kt
index 41ad17dcfbc..878a8b6deca 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/samConversionUtils.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/samConversionUtils.kt
@@ -87,7 +87,7 @@ object SamTypeConversions : ParameterTypeConversion {
             SamConversionDescription(convertedTypeByOriginal, convertedTypeByCandidate!!)
         )
 
-        if (needCompatibilityResolve(candidate, expectedParameterType)) {
+        if (needCompatibilityResolveForSAM(candidate, expectedParameterType)) {
             candidate.addDiagnostic(LowerPriorityToPreserveCompatibility)
         }
 
@@ -99,7 +99,7 @@ object SamTypeConversions : ParameterTypeConversion {
         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
         val descriptor = typeToConvert.constructor.declarationDescriptor
         if (descriptor is ClassDescriptor && descriptor.isFun) return false