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

[java] optimizes inner class detection (IDEA-153835)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-04-05 11:49:04 +02:00
parent c84b1eb722
commit 933798230a
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java
+18 -15
View File
@@ -28,6 +28,7 @@ import com.intellij.psi.impl.PsiManagerImpl;
import com.intellij.psi.impl.compiled.ClsFileImpl;
import com.intellij.psi.impl.file.PsiBinaryFileImpl;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.org.objectweb.asm.ClassReader;
import org.jetbrains.org.objectweb.asm.ClassVisitor;
import org.jetbrains.org.objectweb.asm.Opcodes;
@@ -59,7 +60,7 @@ public class ClassFileViewProvider extends SingleRootFileViewProvider {
// skip inner, anonymous, missing and corrupted classes
try {
if (!isInnerClass(file, file.contentsToByteArray(false))) {
if (!isInnerClass(file)) {
return new ClsFileImpl(this);
}
}
@@ -70,29 +71,31 @@ public class ClassFileViewProvider extends SingleRootFileViewProvider {
return null;
}
/** @deprecated use {@link #isInnerClass(VirtualFile, byte[])} (to be removed in IDEA 17) */
@SuppressWarnings("unused")
public static boolean isInnerClass(@NotNull VirtualFile file) {
try {
String name = file.getNameWithoutExtension();
int p = name.lastIndexOf('$', name.length() - 2);
return p > 0 && detectInnerClass(file, file.contentsToByteArray(false));
}
catch (IOException e) {
throw new RuntimeException(e);
}
return detectInnerClass(file, null);
}
public static boolean isInnerClass(@NotNull VirtualFile file, @NotNull byte[] content) {
String name = file.getNameWithoutExtension();
int p = name.lastIndexOf('$', name.length() - 2);
return p > 0 && detectInnerClass(file, content);
return detectInnerClass(file, content);
}
private static boolean detectInnerClass(VirtualFile file, byte[] content) {
private static boolean detectInnerClass(VirtualFile file, @Nullable byte[] content) {
String name = file.getNameWithoutExtension();
int p = name.lastIndexOf('$', name.length() - 2);
if (p <= 0) return false;
Boolean isInner = IS_INNER_CLASS.get(file);
if (isInner != null) return isInner;
if (content == null) {
try {
content = file.contentsToByteArray(false);
}
catch (IOException e) {
throw new RuntimeException(e);
}
}
ClassReader reader = new ClassReader(content);
final Ref<Boolean> ref = Ref.create(Boolean.FALSE);
final String className = reader.getClassName();