inline local: fix for outer lambda + nested lambda/class (IDEA-174979)

java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java

@@ -84,7 +84,7 @@ public class InlineLocalHandler extends JavaInlineActionHandler {
 
     final List<PsiElement> innerClassesWithUsages = Collections.synchronizedList(new ArrayList<PsiElement>());
     final List<PsiElement> innerClassUsages = Collections.synchronizedList(new ArrayList<PsiElement>());
-    final PsiClass containingClass = PsiTreeUtil.getParentOfType(local, PsiClass.class);
+    final PsiElement containingClass = PsiTreeUtil.getParentOfType(local, PsiClass.class, PsiLambdaExpression.class);
     final Query<PsiReference> query = ReferencesSearch.search(local);
     if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> {
       if (query.findFirst() == null){

java/java-tests/testData/refactoring/inlineLocal/LocalInsideLambdaWithNestedLambda.java

@@ -0,0 +1,8 @@
+class Foo {
+    void foo(String s) {
+        Runnable r = () -> {
+            String s2 = s.toString();
+            Runnable r2 = () -> System.out.println(s<caret>2);
+        };
+    }
+}

java/java-tests/testData/refactoring/inlineLocal/LocalInsideLambdaWithNestedLambda.java.after

@@ -0,0 +1,7 @@
+class Foo {
+    void foo(String s) {
+        Runnable r = () -> {
+            Runnable r2 = () -> System.out.println(s.toString());
+        };
+    }
+}

java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineLocalTest.java

@@ -301,6 +301,10 @@ public class InlineLocalTest extends LightCodeInsightTestCase {
     doTest(false);
   }
 
+  public void testLocalInsideLambdaWithNestedLambda() throws Exception {
+    doTest(true);
+  }
+
   private void doTest(final boolean inlineDef, String conflictMessage) throws Exception {
     try {
       doTest(inlineDef);