From b7c1bed8091b819266539297ecb457338294af44 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 14 Aug 2015 18:26:05 +0300 Subject: [PATCH] EA-70292 - KNPE: BindingContext.TYPE_RESOLUTION_SCOPE returns null #EA-70292 Fixed --- .../src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt index 45bbcbccb6c..9d3605696c5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt @@ -271,7 +271,7 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options. val target = referenceExpression.targets(bindingContext).singleOrNull() ?: return val typeReference = type.getStrictParentOfType()!! - val scope = bindingContext[BindingContext.TYPE_RESOLUTION_SCOPE, typeReference]!! + val scope = bindingContext[BindingContext.TYPE_RESOLUTION_SCOPE, typeReference] ?: return val name = target.getName() val targetByName = if (target is ClassifierDescriptor) scope.getClassifier(name, NoLookupLocation.FROM_IDE) else scope.getPackage(name) val canShortenNow = targetByName?.asString() == target.asString()