Less use of RESOLUTUON_SCOPE from BindingContext

2015-10-24 13:36:01 +03:00
parent 961ffee8ee
commit 44415cf321
5 changed files with 37 additions and 47 deletions
@@ -337,7 +337,9 @@ public class ReferenceVariantsHelper(
            expression: KtSimpleNameExpression,
            nameFilter: (Name) -> Boolean
    ): Collection<DeclarationDescriptor> {
-        val resolutionScope = context[BindingContext.RESOLUTION_SCOPE, expression] ?: return listOf()
-        return resolutionScope.getDescriptorsFiltered(DescriptorKindFilter.PACKAGES, nameFilter).filter(visibilityFilter)
+        val resolutionScope = context[BindingContext.LEXICAL_SCOPE, expression] ?: return listOf()
+        return resolutionScope.collectAllFromImportingScopes {
+            it.getDescriptorsFiltered(DescriptorKindFilter.PACKAGES, nameFilter).filter(visibilityFilter)
+        }
    }
 }