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

KT-251 fixed

Browse Source
This commit is contained in:
svtk
2011-09-13 15:38:12 +04:00
parent 261f88c215
commit 74cbb69fd0
3 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class JetPropertyAccessor extends JetDeclaration implements JetDeclaratio
@Override
public boolean hasDeclaredReturnType() {
return false;
return true;
}
@NotNull
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ClassDescriptorResolver.java
+7 -3
View File
@@ -537,8 +537,8 @@ public class ClassDescriptorResolver {
type = typeResolver.resolveType(scope, typeReference);
JetType inType = propertyDescriptor.getInType();
if (inType != null) {
if (!semanticServices.getTypeChecker().isSubtypeOf(type, inType)) {
trace.getErrorHandler().genericError(typeReference.getNode(), "Setter parameter type must be a subtype of the type of the property, i.e. " + inType);
if (!semanticServices.getTypeChecker().equalTypes(type, inType)) {
trace.getErrorHandler().genericError(typeReference.getNode(), "Setter parameter type must be equal to the type of the property, i.e. " + inType);
}
}
else {
@@ -572,10 +572,14 @@ public class ClassDescriptorResolver {
if (getter != null) {
List<AnnotationDescriptor> annotations = annotationResolver.resolveAnnotations(scope, getter.getModifierList());
JetType returnType = null;
JetType outType = propertyDescriptor.getOutType();
JetType returnType = outType;
JetTypeReference returnTypeReference = getter.getReturnTypeReference();
if (returnTypeReference != null) {
returnType = typeResolver.resolveType(scope, returnTypeReference);
if (outType != null && !semanticServices.getTypeChecker().equalTypes(returnType, outType)) {
trace.getErrorHandler().genericError(returnTypeReference.getNode(), "Getter return type must be equal to the type of the property, i.e. " + propertyDescriptor.getReturnType());
}
}
getterDescriptor = new PropertyGetterDescriptor(