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

fix another case of property resolution

Browse Source 
val <T> T.prop: Something<T>
This commit is contained in:
Stepan Koltsov
2012-01-13 03:55:11 +04:00
parent a8ff7e5aaf
commit 8055cf0704
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+3 -2
View File
@@ -1012,7 +1012,6 @@ public class JavaDescriptorResolver {
PsiType receiverType = entry.getValue().receiverType;
MembersForProperty members = entry.getValue();
JetType type = semanticServices.getTypeTransformer().transformToType(propertyType);
boolean isFinal;
if (members.setter == null && members.getter == null) {
isFinal = false;
@@ -1023,7 +1022,7 @@ public class JavaDescriptorResolver {
} else {
isFinal = false;
}
PsiMemberWrapper anyMember;
if (members.getter != null) {
anyMember = members.getter;
@@ -1088,6 +1087,8 @@ public class JavaDescriptorResolver {
receiverJetType = semanticServices.getTypeTransformer().transformToType(receiverType);
}
JetType type = semanticServices.getTypeTransformer().transformToType(propertyType);
propertyDescriptor.setType(
type,
typeParameters,