azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renames

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-01-15 19:20:24 +03:00
parent 3caef82184
commit 59f24020b2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java
+2 -2
View File
@@ -195,7 +195,7 @@ public class LazyTopDownAnalyzer {
public void visitImportDirective(@NotNull JetImportDirective importDirective) { public void visitImportDirective(@NotNull JetImportDirective importDirective) {
LazyFileScope fileScope = resolveSession.getScopeProvider().getScopeForFile( LazyFileScope fileScope = resolveSession.getScopeProvider().getScopeForFile(
importDirective.getContainingJetFile()); importDirective.getContainingJetFile());
fileScope.forceResolveImportDirective(importDirective); fileScope.forceResolveImport(importDirective);
} }
private void visitClassOrObject(@NotNull JetClassOrObject classOrObject) { private void visitClassOrObject(@NotNull JetClassOrObject classOrObject) {
@@ -365,7 +365,7 @@ public class LazyTopDownAnalyzer {
private static void resolveAndCheckImports(@NotNull JetFile file, @NotNull KotlinCodeAnalyzer resolveSession) { private static void resolveAndCheckImports(@NotNull JetFile file, @NotNull KotlinCodeAnalyzer resolveSession) {
LazyFileScope fileScope = resolveSession.getScopeProvider().getScopeForFile(file); LazyFileScope fileScope = resolveSession.getScopeProvider().getScopeForFile(file);
fileScope.forceResolveAllContents(); fileScope.forceResolveAllImports();
} }
private static void registerScope( private static void registerScope(
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt
+2 -2
View File
@@ -32,12 +32,12 @@ class LazyFileScope private(
debugName: String debugName: String
) : ChainedScope(containingDeclaration, debugName, aliasImportsScope, allUnderImportsScope, defaultAliasImportsScope, defaultAllUnderImportsScope) { ) : ChainedScope(containingDeclaration, debugName, aliasImportsScope, allUnderImportsScope, defaultAliasImportsScope, defaultAllUnderImportsScope) {
public fun forceResolveAllContents() { public fun forceResolveAllImports() {
aliasImportsScope.forceResolveAllContents() aliasImportsScope.forceResolveAllContents()
allUnderImportsScope.forceResolveAllContents() allUnderImportsScope.forceResolveAllContents()
} }
public fun forceResolveImportDirective(importDirective: JetImportDirective) { public fun forceResolveImport(importDirective: JetImportDirective) {
if (importDirective.isAllUnder()) { if (importDirective.isAllUnder()) {
allUnderImportsScope.forceResolveImportDirective(importDirective) allUnderImportsScope.forceResolveImportDirective(importDirective)
} }
idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java
+1 -1
View File
@@ -161,7 +161,7 @@ public abstract class ElementResolver {
else if (resolveElement instanceof JetImportDirective) { else if (resolveElement instanceof JetImportDirective) {
JetImportDirective importDirective = (JetImportDirective) resolveElement; JetImportDirective importDirective = (JetImportDirective) resolveElement;
LazyFileScope scope = resolveSession.getScopeProvider().getScopeForFile(importDirective.getContainingJetFile()); LazyFileScope scope = resolveSession.getScopeProvider().getScopeForFile(importDirective.getContainingJetFile());
scope.forceResolveAllContents(); scope.forceResolveAllImports();
} }
else if (resolveElement instanceof JetAnnotationEntry) { else if (resolveElement instanceof JetAnnotationEntry) {
annotationAdditionalResolve(resolveSession, (JetAnnotationEntry) resolveElement); annotationAdditionalResolve(resolveSession, (JetAnnotationEntry) resolveElement);