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

bytecode viewer: search for inner classes inside libraries relative to library class root (IDEA-135427)

Browse Source
This commit is contained in:
Anna Kozlova
2015-01-20 17:15:52 +01:00
parent d5ba847c86
commit c59b7e4f6d
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ByteCodeViewerManager.java
View File

@@ -25,6 +25,7 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.CompilerModuleExtension;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
@@ -33,6 +34,7 @@ import com.intellij.psi.*;
import com.intellij.psi.presentation.java.SymbolPresentationUtil;
import com.intellij.psi.util.ClassUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.ui.content.Content;
import org.jetbrains.annotations.NotNull;
@@ -180,12 +182,23 @@ public class ByteCodeViewerManager extends DockablePopupManager<ByteCodeViewerCo
Module module = ModuleUtilCore.findModuleForPsiElement(psiElement);
if (module == null){
final Project project = containingClass.getProject();
final PsiClass aClass = JavaPsiFacade.getInstance(project).findClass(classVMName, psiElement.getResolveScope());
final PsiClass topLevelClass = PsiUtil.getTopLevelClass(psiElement);
final String qualifiedName = topLevelClass != null ? topLevelClass.getQualifiedName() : null;
final PsiClass aClass = qualifiedName != null
? JavaPsiFacade.getInstance(project).findClass(qualifiedName, psiElement.getResolveScope())
: null;
if (aClass != null) {
final VirtualFile virtualFile = PsiUtilCore.getVirtualFile(aClass);
if (virtualFile != null && ProjectRootManager.getInstance(project).getFileIndex().isInLibraryClasses(virtualFile)) {
final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
if (virtualFile != null && fileIndex.isInLibraryClasses(virtualFile)) {
try {
return processClassFile(virtualFile.contentsToByteArray());
final VirtualFile rootForFile = fileIndex.getClassRootForFile(virtualFile);
if (rootForFile != null) {
final VirtualFile classFile = rootForFile.findFileByRelativePath("/" + classVMName.replace('.', '/') + ".class");
if (classFile != null) {
return processClassFile(classFile.contentsToByteArray());
}
}
}
catch (IOException e) {
LOG.error(e);