From c658fbbb51a876a0a4f2ea2e84d44ccc0d1948a3 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Wed, 13 Jun 2012 13:24:50 +0400
Subject: [PATCH] Fix import order: default imports come first (lowest
 priority)

---
 .../src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
index af253723d26..12149b12431 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
@@ -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(),