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

KT-6774 Cannot find equals() when comparing with null

Browse Source 
#KT-6774 Fixed
This commit is contained in:
Andrey Breslav
2015-02-13 19:41:36 +01:00
parent 99b049af20
commit c61a29d4f5
4 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java
+5 -3
View File
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
import org.jetbrains.kotlin.descriptors.ClassifierDescriptor;
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor;
import org.jetbrains.kotlin.descriptors.annotations.Annotations;
import org.jetbrains.kotlin.resolve.scopes.JetScope;
@@ -223,12 +223,14 @@ public class CommonSupertypes {
nullable |= type.isMarkedNullable();
}
// TODO : attributes?
JetScope newScope = JetScope.Empty.INSTANCE$;
DeclarationDescriptor declarationDescriptor = constructor.getDeclarationDescriptor();
ClassifierDescriptor declarationDescriptor = constructor.getDeclarationDescriptor();
if (declarationDescriptor instanceof ClassDescriptor) {
newScope = ((ClassDescriptor) declarationDescriptor).getMemberScope(newProjections);
}
else if (declarationDescriptor instanceof TypeParameterDescriptor) {
newScope = ((TypeParameterDescriptor) declarationDescriptor).getUpperBoundsAsType().getMemberScope();
}
return new JetTypeImpl(Annotations.EMPTY, constructor, nullable, newProjections, newScope);
}