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

Fix import order: default imports come first (lowest priority)

Browse Source
This commit is contained in:
Andrey Breslav
2012-06-13 13:24:50 +04:00
parent 5e47b923b3
commit c658fbbb51
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
+2 -1
View File
@@ -62,8 +62,9 @@ public class ScopeProvider {
WritableScope writableScope = new WritableScopeImpl(
JetScope.EMPTY, packageDescriptor, RedeclarationHandler.DO_NOTHING, "File scope for declaration resolution");
writableScope.importScope(resolveSession.getPackageDescriptorByFqName(FqName.ROOT).getMemberScope());
List<JetImportDirective> importDirectives = Lists.newArrayList(file.getImportDirectives());
List<JetImportDirective> importDirectives = Lists.newArrayList();
resolveSession.getModuleConfiguration().addDefaultImports(importDirectives);
importDirectives.addAll(file.getImportDirectives());
ImportsResolver.processImportsInFile(true, writableScope, importDirectives,
resolveSession.getPackageDescriptorByFqName(FqName.ROOT).getMemberScope(),
resolveSession.getModuleConfiguration(), resolveSession.getTrace(),