MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

inline local: go through lambda/inner class hierarchy evenly (IDEA-162909)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-10-21 14:52:31 +02:00
parent 8a276d0bf4
commit 260c6317c8
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java
+5 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -45,7 +45,9 @@ import com.intellij.refactoring.listeners.RefactoringEventData;
import com.intellij.refactoring.listeners.RefactoringEventListener;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.refactoring.util.InlineUtil;
import com.intellij.util.*;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.Query;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -96,7 +98,7 @@ public class InlineLocalHandler extends JavaInlineActionHandler {
final PsiElement element = psiReference.getElement();
PsiElement innerClass = PsiTreeUtil.getParentOfType(element, PsiClass.class, PsiLambdaExpression.class);
while (innerClass != containingClass && innerClass != null) {
final PsiClass parentPsiClass = PsiTreeUtil.getParentOfType(innerClass, PsiClass.class, true);
final PsiElement parentPsiClass = PsiTreeUtil.getParentOfType(innerClass.getParent(), PsiClass.class, PsiLambdaExpression.class);
if (parentPsiClass == containingClass) {
if (innerClass instanceof PsiLambdaExpression) {
if (PsiTreeUtil.isAncestor(innerClass, local, false)) {
java/java-tests/testData/refactoring/inlineLocal/InlineVariableIntoNestedLambda.java
+6
View File
@@ -0,0 +1,6 @@
class Test {
{
String <caret>s = "hello";
Runnable r = () -> {Runnable rr = () -> System.out.println(s);};
}
}
java/java-tests/testData/refactoring/inlineLocal/InlineVariableIntoNestedLambda.java.after
+5
View File
@@ -0,0 +1,5 @@
class Test {
{
Runnable r = () -> {Runnable rr = () -> System.out.println("hello");};
}
}
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java
+5 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -292,6 +292,10 @@ public class InlineLocalTest extends LightCodeInsightTestCase {
"Variable 'hello' is accessed for writing");
}
public void testInlineVariableIntoNestedLambda() throws Exception {
doTest(false);
}
public void testAvoidTypeSpecificationWhenPossibleToAvoid() throws Exception {
doTest(false);
}