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

Revert "Suppress "nothing to override" on equals, hashCode, toString"

Browse Source 
This reverts commit 640dac834f.
This commit is contained in:
Alexander Udalov
2014-03-02 21:38:25 +04:00
parent bd80e325b3
commit afc3d33576
1 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+1 -23
View File
@@ -534,34 +534,12 @@ public class OverrideResolver {
if (invisibleOverriddenDescriptor != null) { if (invisibleOverriddenDescriptor != null) {
reportError.cannotOverrideInvisibleMember(invisibleOverriddenDescriptor); reportError.cannotOverrideInvisibleMember(invisibleOverriddenDescriptor);
} }
else if (!shouldSuppressOverride(declared)) { else {
reportError.nothingToOverride(); reportError.nothingToOverride();
} }
} }
} }
// TODO: this is temporary to migrate equals, hashCode, toString from extensions to Any
private static boolean shouldSuppressOverride(@NotNull CallableMemberDescriptor descriptor) {
String name = descriptor.getName().asString();
JetType returnType = descriptor.getReturnType();
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
if (name.equals("equals") && builtIns.getBooleanType().equals(returnType)) {
List<ValueParameterDescriptor> parameters = descriptor.getValueParameters();
return parameters.size() == 1 && builtIns.isAnyOrNullableAny(parameters.iterator().next().getType());
}
if (name.equals("hashCode") && builtIns.getIntType().equals(returnType)) {
return descriptor.getValueParameters().isEmpty();
}
if (name.equals("toString") && builtIns.getStringType().equals(returnType)) {
return descriptor.getValueParameters().isEmpty();
}
return false;
}
private void checkOverrideForComponentFunction(@NotNull final CallableMemberDescriptor componentFunction) { private void checkOverrideForComponentFunction(@NotNull final CallableMemberDescriptor componentFunction) {
final JetAnnotationEntry dataAnnotation = findDataAnnotationForDataClass(componentFunction.getContainingDeclaration()); final JetAnnotationEntry dataAnnotation = findDataAnnotationForDataClass(componentFunction.getContainingDeclaration());