From b044c4fcee31ba6c36c981f23413907be9fb63a0 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 16 Apr 2015 19:33:32 +0200
Subject: [PATCH] extract method: do not pass redundant parameters if
 extracting from lambda body (IDEA-139292)

---
 .../controlFlow/LocalsControlFlowPolicy.java  |  4 ++-
 .../FromLambdaBodyToAnonymous.java            | 31 ++++++++++++++++
 .../FromLambdaBodyToAnonymous_after.java      | 35 +++++++++++++++++++
 .../refactoring/ExtractMethodTest.java        |  4 +++
 4 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 java/java-tests/testData/refactoring/extractMethod/FromLambdaBodyToAnonymous.java
 create mode 100644 java/java-tests/testData/refactoring/extractMethod/FromLambdaBodyToAnonymous_after.java

diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/LocalsControlFlowPolicy.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/LocalsControlFlowPolicy.java
index 5418b8679bd7..9e088b82b055 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/LocalsControlFlowPolicy.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/LocalsControlFlowPolicy.java
@@ -16,6 +16,7 @@
 package com.intellij.psi.controlFlow;
 
 import com.intellij.psi.*;
+import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -54,7 +55,8 @@ public class LocalsControlFlowPolicy implements ControlFlowPolicy {
     }
     if (codeFragment == null) return null;
     if (myCodeFragment.getContainingFile() == codeFragment.getContainingFile() &&  // in order for jsp includes to work
-        !myCodeFragment.equals(codeFragment) && !(myCodeFragment.getParent() instanceof PsiLambdaExpression)) {
+        !myCodeFragment.equals(codeFragment) &&
+        !(myCodeFragment.getParent() instanceof PsiLambdaExpression && codeFragment.equals(PsiTreeUtil.getParentOfType(myCodeFragment, PsiCodeBlock.class)))) {
       return null;
     }
     return (PsiVariable)refElement;
diff --git a/java/java-tests/testData/refactoring/extractMethod/FromLambdaBodyToAnonymous.java b/java/java-tests/testData/refactoring/extractMethod/FromLambdaBodyToAnonymous.java
new file mode 100644
index 000000000000..a8456bdf56ec
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethod/FromLambdaBodyToAnonymous.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class Foo {
+  public void update(int i) {}
+}
+
+class FooBar {
+  void foo(int value){
+    Foo tm = new Foo() {
+      {
+        Runnable r = () -> {
+          <selection>update(value);</selection>
+        };
+      }
+    };
+  }
+}
diff --git a/java/java-tests/testData/refactoring/extractMethod/FromLambdaBodyToAnonymous_after.java b/java/java-tests/testData/refactoring/extractMethod/FromLambdaBodyToAnonymous_after.java
new file mode 100644
index 000000000000..03ac902fe43c
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethod/FromLambdaBodyToAnonymous_after.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class Foo {
+  public void update(int i) {}
+}
+
+class FooBar {
+  void foo(int value){
+    Foo tm = new Foo() {
+      {
+        Runnable r = () -> {
+            newMethod();
+        };
+      }
+
+        private void newMethod() {
+            update(value);
+        }
+    };
+  }
+}
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
index bb74f139c8f2..cad137eae2ab 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
@@ -580,6 +580,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
     doTest();
   }
 
+  public void testFromLambdaBodyToAnonymous() throws Exception {
+    doTest();
+  }
+
   public void testFromLambdaBodyWithReturn() throws Exception {
     doTest();
   }