MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-18 16:17:00 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-32493 - UOE: AopPointcutExpressionFindUsagesProvider.getDescriptiveName

Browse Source
This commit is contained in:
anna
2011-12-28 13:40:20 +01:00
parent a7d78a8775
commit ec76f69824
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/util/ConflictsUtil.java
+10 -2
View File
@@ -21,6 +21,7 @@
package com.intellij.refactoring.util;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.FileContextUtil;
import com.intellij.psi.util.PsiFormatUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.RefactoringBundle;
@@ -37,9 +38,16 @@ public class ConflictsUtil {
public static PsiElement getContainer(PsiElement place) {
PsiElement parent = place;
while (true) {
if (parent instanceof PsiMember && !(parent instanceof PsiTypeParameter))
if (parent instanceof PsiMember && !(parent instanceof PsiTypeParameter)) {
return parent;
if (parent instanceof PsiFile) return parent;
}
if (parent instanceof PsiFile) {
PsiElement host = FileContextUtil.getFileContext((PsiFile)parent);
if (host == null) {
return parent;
}
parent = host;
}
parent = parent.getParent();
}
}