Replace explicit parameter with it : correct handling of it from outer lambda #KT-12437 Fixed

(cherry picked from commit cb8fe96)

idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt

@@ -47,17 +47,19 @@ class ReplaceExplicitFunctionLiteralParamWithItIntention() : PsiElementBaseInten
         if (parameter.typeReference != null) return false
 
         if (functionLiteral.anyDescendantOfType<KtFunctionLiteral>() { literal ->
-            literal !== functionLiteral &&
+            literal.usesName(element.text) &&
-            !literal.hasParameterSpecification() &&
+            (!literal.hasParameterSpecification() || literal.usesName("it"))
-            literal.anyDescendantOfType<KtSimpleNameExpression> { nameExpr ->
-                nameExpr.getReferencedName() == element.text
-            }
         } ) return false
 
         text = "Replace explicit parameter '${parameter.name}' with 'it'"
         return true
     }
 
+    private fun KtFunctionLiteral.usesName(name: String): Boolean =
+            anyDescendantOfType<KtSimpleNameExpression> {
+                nameExpr -> nameExpr.getReferencedName() == name
+            }
+
     override fun startInWriteAction(): Boolean = false
 
     override fun invoke(project: Project, editor: Editor, element: PsiElement) {

idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_itFromOuterLambda.kt

@@ -0,0 +1,9 @@
+// IS_APPLICABLE: false
+
+// See KT-12437: it from outer lambda
+fun acceptLambda(p: Int, f: (Int) -> Int): Int = f(p)
+fun use() {
+    acceptLambda(1) {
+        acceptLambda(2) { <caret>p2 -> it * 10 + p2 }
+    }.hashCode()
+}

idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java

@@ -8293,6 +8293,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("notApplicable_itFromOuterLambda.kt")
+        public void testNotApplicable_itFromOuterLambda() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_itFromOuterLambda.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("notApplicable_nestedLiterals.kt")
         public void testNotApplicable_nestedLiterals() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_nestedLiterals.kt");