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

Refactor JavaPropertyResolver#getPropertyType

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-31 20:15:29 +04:00
parent 93db2f06b3
commit a7c593275a
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
+12 -12
View File
@@ -306,25 +306,25 @@ public final class JavaPropertyResolver {
return Collections.emptyList();
}
@NotNull
private JetType getPropertyType(
PropertyPsiData members,
PropertyPsiDataElement characteristicMember,
TypeVariableResolver typeVariableResolverForPropertyInternals
) {
JetType propertyType;
if (!characteristicMember.getType().getTypeString().isEmpty()) {
propertyType = semanticServices.getTypeTransformer().transformToType(characteristicMember.getType().getTypeString(), typeVariableResolverForPropertyInternals);
return semanticServices.getTypeTransformer().transformToType(
characteristicMember.getType().getTypeString(), typeVariableResolverForPropertyInternals);
}
else {
propertyType = semanticServices.getTypeTransformer().transformToType(characteristicMember.getType().getPsiType(), typeVariableResolverForPropertyInternals);
if (JavaAnnotationResolver.findAnnotation(characteristicMember.getType().getPsiNotNullOwner(),
JvmAbi.JETBRAINS_NOT_NULL_ANNOTATION.getFqName().getFqName()) != null) {
propertyType = TypeUtils.makeNullableAsSpecified(propertyType, false);
}
else if (members.getGetter() == null && members.getSetter() == null && members.getField().getMember().isFinal() && members.getField().getMember().isStatic()) {
// http://youtrack.jetbrains.com/issue/KT-1388
propertyType = TypeUtils.makeNotNullable(propertyType);
}
JetType propertyType = semanticServices.getTypeTransformer().transformToType(
characteristicMember.getType().getPsiType(), typeVariableResolverForPropertyInternals);
boolean hasNotNullAnnotation = JavaAnnotationResolver.findAnnotation(
characteristicMember.getType().getPsiNotNullOwner(),
JvmAbi.JETBRAINS_NOT_NULL_ANNOTATION.getFqName().getFqName()) != null;
if (hasNotNullAnnotation || members.isStaticFinalField()) {
propertyType = TypeUtils.makeNotNullable(propertyType);
}
return propertyType;
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PropertyPsiData.java
+8
View File
@@ -173,4 +173,12 @@ public final class PropertyPsiData {
}
return setter != null;
}
public boolean isStaticFinalField() {
if (getter != null || setter != null) {
return false;
}
assert field != null;
return field.getMember().isFinal() && field.getMember().isStatic();
}
}