From aca21c847dbd6a7fc09cd23c890f227b398195cf Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Sat, 5 Aug 2017 10:08:06 +0300 Subject: [PATCH] [NI] Fix resolution for callable references to nested class members --- .../jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt index 8ee6ebeac74..53e93ec1d18 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt @@ -542,7 +542,8 @@ class PSICallResolver( } } is DoubleColonLHS.Type -> { - val qualifier = expressionTypingContext.trace.get(BindingContext.QUALIFIER, ktExpression.receiverExpression!!.referenceExpression()) + val qualifiedExpression = ktExpression.receiverExpression!!.let { it.referenceExpression() ?: it } + val qualifier = expressionTypingContext.trace.get(BindingContext.QUALIFIER, qualifiedExpression) if (qualifier is ClassQualifier) { LHSResult.Type(qualifier, lhsResult.type.unwrap()) }