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

Omport order fixed: the current package must have the highest priority

Browse Source
This commit is contained in:
Andrey Breslav
2012-07-27 18:44:14 +04:00
parent 58ec90d7ee
commit 6c6317740c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
+3 -3
View File
@@ -67,11 +67,9 @@ public class ScopeProvider {
throw new IllegalStateException("Root package not found"); throw new IllegalStateException("Root package not found");
} }
writableScope.importScope(rootPackageDescriptor.getMemberScope());
// Don't import twice // Don't import twice
if (!packageDescriptor.getQualifiedName().equals(FqName.ROOT)) { if (!packageDescriptor.getQualifiedName().equals(FqName.ROOT)) {
writableScope.importScope(packageDescriptor.getMemberScope()); writableScope.importScope(rootPackageDescriptor.getMemberScope());
} }
List<JetImportDirective> importDirectives = Lists.newArrayList(file.getImportDirectives()); List<JetImportDirective> importDirectives = Lists.newArrayList(file.getImportDirectives());
@@ -81,6 +79,8 @@ public class ScopeProvider {
resolveSession.getModuleConfiguration(), resolveSession.getTrace(), resolveSession.getModuleConfiguration(), resolveSession.getTrace(),
resolveSession.getInjector().getQualifiedExpressionResolver()); resolveSession.getInjector().getQualifiedExpressionResolver());
writableScope.importScope(packageDescriptor.getMemberScope());
writableScope.changeLockLevel(WritableScope.LockLevel.READING); writableScope.changeLockLevel(WritableScope.LockLevel.READING);
// TODO: Cache // TODO: Cache
return writableScope; return writableScope;