From 5017153c72b9972141ebccb5c52c150063554146 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 7 Aug 2015 14:51:44 +0300 Subject: [PATCH] Provide LookupLocation when lookup simple name --- .../kotlin/resolve/QualifiedExpressionResolver.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.java index f41237a72c4..4aa0a5fd77c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.java @@ -26,11 +26,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.incremental.KotlinLookupLocation; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.scopes.AbstractScopeAdapter; import org.jetbrains.kotlin.resolve.scopes.JetScope; -import org.jetbrains.kotlin.resolve.scopes.LookupLocation; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.resolve.validation.SymbolUsageValidator; @@ -229,14 +229,16 @@ public class QualifiedExpressionResolver { descriptors.add(packageDescriptor); } - ClassifierDescriptor classifierDescriptor = outerScope.getClassifier(referencedName, LookupLocation.NO_LOCATION); + KotlinLookupLocation location = new KotlinLookupLocation(referenceExpression); + + ClassifierDescriptor classifierDescriptor = outerScope.getClassifier(referencedName, location); if (classifierDescriptor != null) { descriptors.add(classifierDescriptor); } if (lookupMode == LookupMode.EVERYTHING) { - descriptors.addAll(outerScope.getFunctions(referencedName, LookupLocation.NO_LOCATION)); - descriptors.addAll(outerScope.getProperties(referencedName, LookupLocation.NO_LOCATION)); + descriptors.addAll(outerScope.getFunctions(referencedName, location)); + descriptors.addAll(outerScope.getProperties(referencedName, location)); VariableDescriptor localVariable = outerScope.getLocalVariable(referencedName); if (localVariable != null) {