Current package members to have less priority than explicit imports

This commit is contained in:
Valentin Kipyatkov
2015-01-15 20:54:35 +03:00
parent 59f24020b2
commit 929d6b885d
14 changed files with 188 additions and 93 deletions
@@ -160,7 +160,7 @@ public abstract class ElementResolver {
}
else if (resolveElement instanceof JetImportDirective) {
JetImportDirective importDirective = (JetImportDirective) resolveElement;
LazyFileScope scope = resolveSession.getScopeProvider().getScopeForFile(importDirective.getContainingJetFile());
LazyFileScope scope = resolveSession.getScopeProvider().getFileScope(importDirective.getContainingJetFile());
scope.forceResolveAllImports();
}
else if (resolveElement instanceof JetAnnotationEntry) {