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

IDEA-58104

Browse Source
This commit is contained in:
Alexey Kudravtsev
2010-09-01 11:17:27 +04:00
parent 2b096f46b3
commit 9ce1f7c5c7
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java
+8 -6
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.util.Iconable;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.psi.jsp.JspFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.usageView.UsageInfo;
@@ -45,11 +46,12 @@ public class ClassGroupingRule implements UsageGroupingRule {
}
final PsiElement psiElement = ((PsiElementUsage)usage).getElement();
final PsiFile containingFile = psiElement.getContainingFile();
PsiFile topLevelFile = InjectedLanguageUtil.getTopLevelFile(containingFile);
if (!(containingFile instanceof PsiJavaFile) || containingFile instanceof JspFile) {
if (!(topLevelFile instanceof PsiJavaFile) || topLevelFile instanceof JspFile) {
return null;
}
PsiElement containingClass = psiElement;
PsiElement containingClass = topLevelFile == containingFile ? psiElement : containingFile.getContext();
do {
containingClass = PsiTreeUtil.getParentOfType(containingClass, PsiClass.class, true);
if (containingClass == null || ((PsiClass)containingClass).getQualifiedName() != null) break;
@@ -60,8 +62,8 @@ public class ClassGroupingRule implements UsageGroupingRule {
// check whether the element is in the import list
PsiImportList importList = PsiTreeUtil.getParentOfType(psiElement, PsiImportList.class, true);
if (importList != null) {
final String fileName = getFileNameWithoutExtension(containingFile);
final PsiClass[] classes = ((PsiJavaFile)containingFile).getClasses();
final String fileName = getFileNameWithoutExtension(topLevelFile);
final PsiClass[] classes = ((PsiJavaFile)topLevelFile).getClasses();
for (final PsiClass aClass : classes) {
if (fileName.equals(aClass.getName())) {
containingClass = aClass;
@@ -81,9 +83,9 @@ public class ClassGroupingRule implements UsageGroupingRule {
return new ClassUsageGroup((PsiClass)containingClass);
}
final VirtualFile virtualFile = containingFile.getVirtualFile();
final VirtualFile virtualFile = topLevelFile.getVirtualFile();
if (virtualFile != null) {
return new FileGroupingRule.FileUsageGroup(containingFile.getProject(), virtualFile);
return new FileGroupingRule.FileUsageGroup(topLevelFile.getProject(), virtualFile);
}
return null;
}
java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java
+5 -2
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Iconable;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.psi.util.PsiFormatUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.usageView.UsageInfo;
@@ -46,8 +47,10 @@ public class MethodGroupingRule implements UsageGroupingRule {
public UsageGroup groupUsage(Usage usage) {
if (!(usage instanceof PsiElementUsage)) return null;
PsiElement psiElement = ((PsiElementUsage)usage).getElement();
if (psiElement.getContainingFile() instanceof PsiJavaFile) {
PsiElement containingMethod = psiElement;
PsiFile containingFile = psiElement.getContainingFile();
PsiFile topLevelFile = InjectedLanguageUtil.getTopLevelFile(containingFile);
if (topLevelFile instanceof PsiJavaFile) {
PsiElement containingMethod = topLevelFile == containingFile ? psiElement : containingFile.getContext();
do {
containingMethod = PsiTreeUtil.getParentOfType(containingMethod, PsiMethod.class, true);
if (containingMethod == null || ((PsiMethod)containingMethod).getContainingClass().getQualifiedName() != null) break;