azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract field signature out of Java property signature

Browse Source
This commit is contained in:
Alexander Udalov
2013-07-12 21:37:27 +04:00
parent cf7c27ba79
commit 6035d89c33
4 changed files with 522 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java
+4 -4
View File
@@ -215,7 +215,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
case PROPERTY:
JavaProtoBufUtil.PropertyData data = JavaProtoBufUtil.loadPropertyData(proto, nameResolver);
return data == null ? null :
MemberSignature.fromPropertyData(data.getType(), data.getFieldName(), data.getSyntheticMethodName());
MemberSignature.fromPropertyData(data.getFieldType(), data.getFieldName(), data.getSyntheticMethodName());
default:
return null;
}
@@ -281,12 +281,12 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
@Nullable
public static MemberSignature fromPropertyData(
@NotNull Type type,
@Nullable Type fieldType,
@Nullable String fieldName,
@Nullable String syntheticMethodName
) {
if (fieldName != null) {
return fromFieldNameAndDesc(fieldName, type.getDescriptor());
if (fieldName != null && fieldType != null) {
return fromFieldNameAndDesc(fieldName, fieldType.getDescriptor());
}
else if (syntheticMethodName != null) {
return fromMethodNameAndDesc(syntheticMethodName, JvmAbi.ANNOTATED_PROPERTY_METHOD_SIGNATURE);