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

Refactor JavaPropertyResolver#getReceiverType

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-31 20:16:14 +04:00
parent a7c593275a
commit 6dcb3cc8f7
1 changed files with 4 additions and 8 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
+4 -8
View File
@@ -334,17 +334,13 @@ public final class JavaPropertyResolver {
PropertyPsiDataElement characteristicMember, PropertyPsiDataElement characteristicMember,
TypeVariableResolver typeVariableResolverForPropertyInternals TypeVariableResolver typeVariableResolverForPropertyInternals
) { ) {
JetType receiverType;
if (characteristicMember.getReceiverType() == null) { if (characteristicMember.getReceiverType() == null) {
receiverType = null; return null;
} }
else if (characteristicMember.getReceiverType().getTypeString().length() > 0) { if (!characteristicMember.getReceiverType().getTypeString().isEmpty()) {
receiverType = semanticServices.getTypeTransformer().transformToType(characteristicMember.getReceiverType().getTypeString(), typeVariableResolverForPropertyInternals); return semanticServices.getTypeTransformer().transformToType(characteristicMember.getReceiverType().getTypeString(), typeVariableResolverForPropertyInternals);
} }
else { return semanticServices.getTypeTransformer().transformToType(characteristicMember.getReceiverType().getPsiType(), typeVariableResolverForPropertyInternals);
receiverType = semanticServices.getTypeTransformer().transformToType(characteristicMember.getReceiverType().getPsiType(), typeVariableResolverForPropertyInternals);
}
return receiverType;
} }
private static int getNumberOfNonExtensionProperties(@NotNull Collection<PropertyPsiData> propertyPsiDataCollection) { private static int getNumberOfNonExtensionProperties(@NotNull Collection<PropertyPsiData> propertyPsiDataCollection) {