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

make static: fix inner class check (IDEA-166983)

Browse Source
This commit is contained in:
Anna Kozlova
2017-01-23 16:24:03 +03:00
parent 3a219b6c01
commit edac6e4874
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/makeStatic/MakeStaticJavaCallerChooser.java
+3 -2
View File
@@ -22,7 +22,9 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiModifier;
import com.intellij.psi.search.searches.OverridingMethodsSearch;
import com.intellij.psi.util.ClassUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.changeSignature.MethodNodeBase;
import com.intellij.refactoring.changeSignature.inCallers.JavaCallerChooser;
import com.intellij.refactoring.changeSignature.inCallers.JavaMethodNode;
@@ -53,8 +55,7 @@ abstract class MakeStaticJavaCallerChooser extends JavaCallerChooser {
OverridingMethodsSearch.search(containingMethod).findFirst() == null) {
final PsiClass containingClass = containingMethod.getContainingClass();
if (containingClass != null) {
final PsiClass gContainingClass = containingClass.getContainingClass();
if (gContainingClass == null || gContainingClass.hasModifierProperty(PsiModifier.STATIC)) {
if (ClassUtil.isTopLevelClass(containingClass) || containingClass.hasModifierProperty(PsiModifier.STATIC)) {
final InternalUsageInfo[] refsInMember = MakeStaticUtil.findClassRefsInMember(containingMethod, true);
for (InternalUsageInfo info : refsInMember) {
final PsiElement referencedElement = info.getReferencedElement();
java/java-tests/testData/refactoring/makeMethodStatic/afterDeep.java
+9
View File
@@ -8,4 +8,13 @@ class P {
bazz(k);
bazz(k);
}
void m(int k) {
new Runnable() {
public void run() {}
void mm() {
bazz(k);
}
};
}
}
java/java-tests/testData/refactoring/makeMethodStatic/beforeDeep.java
+9
View File
@@ -8,4 +8,13 @@ class P {
bazz(k);
bazz(k);
}
void m(int k) {
new Runnable() {
public void run() {}
void mm() {
bazz(k);
}
};
}
}