From 23848fa7284ee2feed816899e884b4f57ffb8203 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Thu, 16 Mar 2017 15:44:07 +0300
Subject: [PATCH] Suggest bound references in "Lambda --> Reference" for 1.1+
 only

---
 .../intentions/ConvertLambdaToReferenceIntention.kt   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt
index 801901c7241..b5455185cc7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt
@@ -20,11 +20,13 @@ import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.builtins.getReturnTypeFromFunctionType
 import org.jetbrains.kotlin.builtins.isExtensionFunctionType
 import org.jetbrains.kotlin.builtins.isFunctionType
+import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.idea.imports.importableFqName
 import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
+import org.jetbrains.kotlin.idea.project.languageVersionSettings
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes
 import org.jetbrains.kotlin.psi.*
@@ -81,6 +83,9 @@ class ConvertLambdaToReferenceIntention : SelfTargetingOffsetIndependentIntentio
         }
 
         if (!descriptorHasReceiver && explicitReceiver != null) return false
+        val noBoundReferences = !callableExpression.languageVersionSettings.supportsFeature(LanguageFeature.BoundCallableReferences)
+        if (noBoundReferences && descriptorHasReceiver && explicitReceiver == null) return false
+
         val callableArgumentsCount = (callableExpression as? KtCallExpression)?.valueArguments?.size ?: 0
         if (calleeDescriptor.valueParameters.size != callableArgumentsCount) return false
         if (lambdaMustReturnUnit) {
@@ -95,8 +100,10 @@ class ConvertLambdaToReferenceIntention : SelfTargetingOffsetIndependentIntentio
                     context[REFERENCE_TARGET, it]
                 } as? ValueDescriptor
         val lambdaValueParameterDescriptors = context[FUNCTION, lambdaExpression.functionLiteral]?.valueParameters ?: return false
-        val lambdaParameterAsExplicitReceiver = explicitReceiverDescriptor != null &&
-                                                explicitReceiverDescriptor == lambdaValueParameterDescriptors.firstOrNull()
+        val lambdaParameterAsExplicitReceiver = when (noBoundReferences) {
+            true -> explicitReceiver != null
+            false -> explicitReceiverDescriptor != null && explicitReceiverDescriptor == lambdaValueParameterDescriptors.firstOrNull()
+        }
         val explicitReceiverShift = if (lambdaParameterAsExplicitReceiver) 1 else 0
 
         val lambdaParametersCount = lambdaValueParameterDescriptors.size