From 6c6317740c28ff64418b603bf8ccedb9e6c1e3c0 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 27 Jul 2012 18:44:14 +0400
Subject: [PATCH] Omport order fixed: the current package must have the highest
 priority

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

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 25c7493d290..4552dcda667 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
@@ -67,11 +67,9 @@ public class ScopeProvider {
             throw new IllegalStateException("Root package not found");
         }
 
-        writableScope.importScope(rootPackageDescriptor.getMemberScope());
-
         // Don't import twice
         if (!packageDescriptor.getQualifiedName().equals(FqName.ROOT)) {
-            writableScope.importScope(packageDescriptor.getMemberScope());
+            writableScope.importScope(rootPackageDescriptor.getMemberScope());
         }
 
         List<JetImportDirective> importDirectives = Lists.newArrayList(file.getImportDirectives());
@@ -81,6 +79,8 @@ public class ScopeProvider {
                                              resolveSession.getModuleConfiguration(), resolveSession.getTrace(),
                                              resolveSession.getInjector().getQualifiedExpressionResolver());
 
+        writableScope.importScope(packageDescriptor.getMemberScope());
+
         writableScope.changeLockLevel(WritableScope.LockLevel.READING);
         // TODO: Cache
         return writableScope;