diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java index 2ab57efc908..35de365cc29 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java @@ -195,7 +195,7 @@ public class LazyTopDownAnalyzer { public void visitImportDirective(@NotNull JetImportDirective importDirective) { LazyFileScope fileScope = resolveSession.getScopeProvider().getScopeForFile( importDirective.getContainingJetFile()); - fileScope.forceResolveImportDirective(importDirective); + fileScope.forceResolveImport(importDirective); } private void visitClassOrObject(@NotNull JetClassOrObject classOrObject) { @@ -365,7 +365,7 @@ public class LazyTopDownAnalyzer { private static void resolveAndCheckImports(@NotNull JetFile file, @NotNull KotlinCodeAnalyzer resolveSession) { LazyFileScope fileScope = resolveSession.getScopeProvider().getScopeForFile(file); - fileScope.forceResolveAllContents(); + fileScope.forceResolveAllImports(); } private static void registerScope( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt index 36e97db96a6..ad3b404c350 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt @@ -32,12 +32,12 @@ class LazyFileScope private( debugName: String ) : ChainedScope(containingDeclaration, debugName, aliasImportsScope, allUnderImportsScope, defaultAliasImportsScope, defaultAllUnderImportsScope) { - public fun forceResolveAllContents() { + public fun forceResolveAllImports() { aliasImportsScope.forceResolveAllContents() allUnderImportsScope.forceResolveAllContents() } - public fun forceResolveImportDirective(importDirective: JetImportDirective) { + public fun forceResolveImport(importDirective: JetImportDirective) { if (importDirective.isAllUnder()) { allUnderImportsScope.forceResolveImportDirective(importDirective) } diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java index 9be0004aacd..506000626c1 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java +++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java @@ -161,7 +161,7 @@ public abstract class ElementResolver { else if (resolveElement instanceof JetImportDirective) { JetImportDirective importDirective = (JetImportDirective) resolveElement; LazyFileScope scope = resolveSession.getScopeProvider().getScopeForFile(importDirective.getContainingJetFile()); - scope.forceResolveAllContents(); + scope.forceResolveAllImports(); } else if (resolveElement instanceof JetAnnotationEntry) { annotationAdditionalResolve(resolveSession, (JetAnnotationEntry) resolveElement);