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

Raw .class file descriptor strings leak fixed.

Browse Source
This commit is contained in:
Maxim Shafirov
2009-10-21 18:02:04 +04:00
parent b0bb6fb7f1
commit 536f6f7fb4
2 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/compiled/ClsStubBuilder.java
+23 -25
View File
@@ -364,34 +364,32 @@ public class ClsStubBuilder {
final byte flags = PsiMethodStubImpl.packFlags(isConstructor, isAnnotationMethod, isVarargs, isDeprecated, false);
String canonicalMethodName = isConstructor ? myResult.getName() : name;
final boolean[] parsedViaGenericSignature = new boolean[1];
final List<String> args = new ArrayList<String>();
final List<String> throwables = exceptions != null ? new ArrayList<String>() : null;
final PsiModifierListStub[] modlist = new PsiModifierListStub[1];
PsiMethodStubImpl stub = new PsiMethodStubImpl(myResult, StringRef.fromString(canonicalMethodName), flags, null){
@Override
protected TypeInfo createReturnType() {
modlist[0] = new PsiModifierListStubImpl(this, packMethodFlags(access));
parsedViaGenericSignature[0] = false;
String returnType;
if (signature == null) {
returnType = parseMethodViaDescription(desc, this, args);
}
else {
try {
returnType = parseMethodViaGenericSignature(signature, this, args, throwables);
parsedViaGenericSignature[0] = true;
}
catch (ClsFormatException e) {
returnType = parseMethodViaDescription(desc, this, args);
}
}
return TypeInfo.fromString(returnType);
PsiMethodStubImpl stub = new PsiMethodStubImpl(myResult, StringRef.fromString(canonicalMethodName), flags, null);
final PsiModifierListStub modlist = new PsiModifierListStubImpl(stub, packMethodFlags(access));
boolean parsedViaGenericSignature = false;
String returnType;
if (signature == null) {
returnType = parseMethodViaDescription(desc, stub, args);
}
else {
try {
returnType = parseMethodViaGenericSignature(signature, stub, args, throwables);
parsedViaGenericSignature = true;
}
};
catch (ClsFormatException e) {
returnType = parseMethodViaDescription(desc, stub, args);
}
}
stub.setReturnType(TypeInfo.fromString(returnType));
boolean nonStaticInnerClassConstructor =
isConstructor && !parsedViaGenericSignature[0] && !(myParent instanceof PsiFileStub) && (myModlist.getModifiersMask() & Opcodes.ACC_STATIC) == 0;
isConstructor && !parsedViaGenericSignature && !(myParent instanceof PsiFileStub) && (myModlist.getModifiersMask() & Opcodes.ACC_STATIC) == 0;
final PsiParameterListStubImpl parameterList = new PsiParameterListStubImpl(stub);
final int paramCount = args.size();
@@ -408,11 +406,11 @@ public class ClsStubBuilder {
new PsiModifierListStubImpl(parameterStub, 0);
}
String[] thrownTypes = buildThrowsList(exceptions, throwables, parsedViaGenericSignature[0]);
String[] thrownTypes = buildThrowsList(exceptions, throwables, parsedViaGenericSignature);
new PsiClassReferenceListStubImpl(JavaStubElementTypes.THROWS_LIST, stub, thrownTypes, PsiReferenceList.Role.THROWS_LIST);
int ignoreCount = (access & Opcodes.ACC_STATIC) != 0 ? 0 : 1;
return new AnnotationParamCollectingVisitor(stub, modlist[0], ignoreCount, paramCount, paramStubs);
return new AnnotationParamCollectingVisitor(stub, modlist, ignoreCount, paramCount, paramStubs);
}
private static String[] buildThrowsList(String[] exceptions, List<String> throwables, boolean parsedViaGenericSignature) {
java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiMethodStubImpl.java
+5 -6
View File
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
public class PsiMethodStubImpl extends StubBase<PsiMethod> implements PsiMethodStub {
private final TypeInfo myReturnType;
private TypeInfo myReturnType;
private final byte myFlags;
private final StringRef myName;
private StringRef myDefaultValueText;
@@ -51,16 +51,11 @@ public class PsiMethodStubImpl extends StubBase<PsiMethod> implements PsiMethodS
final StringRef defaultValueText) {
super(parent, isAnnotationMethod(flags) ? JavaStubElementTypes.ANNOTATION_METHOD : JavaStubElementTypes.METHOD);
myReturnType = createReturnType();
myFlags = flags;
myName = name;
myDefaultValueText = defaultValueText;
}
protected TypeInfo createReturnType() {
return myReturnType;
}
public PsiMethodStubImpl(final StubElement parent,
final StringRef name,
final TypeInfo returnType,
@@ -74,6 +69,10 @@ public class PsiMethodStubImpl extends StubBase<PsiMethod> implements PsiMethodS
myDefaultValueText = defaultValueText;
}
public void setReturnType(TypeInfo returnType) {
myReturnType = returnType;
}
public boolean isConstructor() {
return (myFlags & CONSTRUCTOR) != 0;
}