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

Fix NPE in ReferenceVariantsHelper

Browse Source 
#KT-6500 Fixed
This commit is contained in:
Natalia Ukhorskaya
2014-12-22 14:06:35 +03:00
parent e35b960eb5
commit 8896aa93b4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+1 -1
View File
@@ -786,7 +786,7 @@ public class DescriptorResolver {
public static void checkUpperBoundType( public static void checkUpperBoundType(
JetTypeReference upperBound, JetTypeReference upperBound,
JetType upperBoundType, @NotNull JetType upperBoundType,
boolean isClassObjectConstraint, boolean isClassObjectConstraint,
BindingTrace trace BindingTrace trace
) { ) {
core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java
+1 -1
View File
@@ -299,7 +299,7 @@ public class TypeUtils {
} }
} }
public static boolean canHaveSubtypes(JetTypeChecker typeChecker, JetType type) { public static boolean canHaveSubtypes(JetTypeChecker typeChecker, @NotNull JetType type) {
if (type.isMarkedNullable()) { if (type.isMarkedNullable()) {
return true; return true;
} }
idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt
+1 -1
View File
@@ -173,7 +173,7 @@ public class ReferenceVariantsHelper(
private fun getQualifierRuntimeType(receiver: JetExpression): JetType? { private fun getQualifierRuntimeType(receiver: JetExpression): JetType? {
val type = context[BindingContext.EXPRESSION_TYPE, receiver] val type = context[BindingContext.EXPRESSION_TYPE, receiver]
if (TypeUtils.canHaveSubtypes(JetTypeChecker.DEFAULT, type)) { if (type != null && TypeUtils.canHaveSubtypes(JetTypeChecker.DEFAULT, type)) {
val evaluator = receiver.getContainingFile().getCopyableUserData(JetCodeFragment.RUNTIME_TYPE_EVALUATOR) val evaluator = receiver.getContainingFile().getCopyableUserData(JetCodeFragment.RUNTIME_TYPE_EVALUATOR)
return evaluator?.invoke(receiver) return evaluator?.invoke(receiver)
} }