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

IDEA-25246 (decompile boolean constants)

Browse Source
This commit is contained in:
Roman Shevchenko
2013-04-02 22:41:55 +02:00
parent 4d49e38363
commit 25f1fa203f
5 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -303,10 +303,6 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
});
}
@Override
public void visitAttribute(final Attribute attr) {
}
@Override
public void visitInnerClass(final String name, final String outerName, final String innerName, final int access) {
if ((access & Opcodes.ACC_SYNTHETIC) != 0) return;
@@ -339,13 +335,15 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
@Override
@Nullable
public FieldVisitor visitField(final int access, final String name, final String desc, final String signature, final Object value) {
public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
if ((access & Opcodes.ACC_SYNTHETIC) != 0) return null;
if (!isCorrectName(name)) return null;
final byte flags = PsiFieldStubImpl.packFlags((access & Opcodes.ACC_ENUM) != 0, (access & Opcodes.ACC_DEPRECATED) != 0, false);
final PsiFieldStub stub = new PsiFieldStubImpl(myResult, name, fieldType(desc, signature), constToString(value), flags);
final PsiModifierListStub modList = new PsiModifierListStubImpl(stub, packFieldFlags(access));
byte flags = PsiFieldStubImpl.packFlags((access & Opcodes.ACC_ENUM) != 0, (access & Opcodes.ACC_DEPRECATED) != 0, false);
TypeInfo type = fieldType(desc, signature);
String initializer = constToString(value, "boolean".equals(type.text.getString()));
PsiFieldStub stub = new PsiFieldStubImpl(myResult, name, type, initializer, flags);
PsiModifierListStub modList = new PsiModifierListStubImpl(stub, packFieldFlags(access));
return new AnnotationCollectingVisitor(modList);
}
@@ -358,7 +356,8 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
catch (ClsFormatException e) {
return fieldTypeViaDescription(desc);
}
} else {
}
else {
return fieldTypeViaDescription(desc);
}
}
@@ -536,7 +535,7 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
@Override
public void visit(final String name, final Object value) {
valuePairPrefix(name);
myBuilder.append(constToString(value));
myBuilder.append(constToString(value, false));
}
@Override
@@ -696,13 +695,21 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
}
@Nullable
private static String constToString(@Nullable Object value) {
private static String constToString(@Nullable Object value, boolean isBoolean) {
if (value == null) return null;
if (value instanceof String) return "\"" + StringUtil.escapeStringCharacters((String)value) + "\"";
if (value instanceof Integer || value instanceof Boolean) return value.toString();
if (value instanceof Boolean) return value.toString();
if (value instanceof Long) return value.toString() + "L";
if (value instanceof Integer) {
if (isBoolean) {
if (value.equals(0)) return "false";
if (value.equals(1)) return "true";
}
return value.toString();
}
if (value instanceof Double) {
final double d = ((Double)value).doubleValue();
if (Double.isInfinite(d)) {

15
java/java-tests/testData/psi/cls/mirror/Booleans.txt Normal file
View File

@@ -0,0 +1,15 @@
// IntelliJ API Decompiler stub source generated from a class file
// Implementation of methods is not available
package pkg;
class Booleans {
public static final boolean RELEASE = true;
public static final boolean DEBUG = false;
public static final boolean PROFILE = false;
public static final boolean LOGV = false;
public static final boolean LOGD = true;
Booleans() { /* compiled code */ }
}

BIN
java/java-tests/testData/psi/cls/mirror/pkg/Booleans.class Normal file
View File

Binary file not shown.

9
java/java-tests/testData/psi/cls/mirror/src/pkg/Booleans.java Normal file
View File

@@ -0,0 +1,9 @@
package pkg;
class Booleans {
public static final boolean RELEASE = true;
public static final boolean DEBUG = false;
public static final boolean PROFILE = false;
public static final boolean LOGV = false;
public static final boolean LOGD = true;
}

1
java/java-tests/testSrc/com/intellij/psi/ClsMirrorBuildingTest.java
View File

@@ -40,6 +40,7 @@ public class ClsMirrorBuildingTest extends LightIdeaTestCase {
public void testMethodReceiver() { doTest(); }
public void testPackageInfo() { doTest("package-info"); }
public void testEA40568() { doTest(); }
public void testBooleans() { doTest(); }
private void doTest() {
doTest(getTestName(false));