Make declarations from the current package be resolved before declarations in default package (EA-43715)

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java

@@ -86,8 +86,8 @@ public class ScopeProvider {
 
         return new ChainedScope(packageDescriptor,
                                 "File scope: " + file.getName(),
-                                rootPackageDescriptor.getMemberScope(),
                                 packageDescriptor.getMemberScope(),
+                                rootPackageDescriptor.getMemberScope(),
                                 importsScope,
                                 defaultImportsScope.compute());
     }

compiler/testData/lazyResolve/namespaceComparator/sameClassNameResolve.kt

@@ -0,0 +1,10 @@
+// FILE: SameClassNameResolveTest.kt
+package test
+
+open class Base
+class SubBase: Base()
+
+// FILE: SameClassNameResolveRoot.kt
+
+open class Base
+class SubBase: Base()

compiler/testData/lazyResolve/namespaceComparator/sameClassNameResolve.txt

@@ -0,0 +1,9 @@
+package test
+
+internal open class Base {
+    /*primary*/ public constructor Base()
+}
+
+internal final class SubBase : test.Base {
+    /*primary*/ public constructor SubBase()
+}

compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java

@@ -2122,6 +2122,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
             doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/propertyClassFileDependencyRecursion.kt");
         }
         
+        @TestMetadata("sameClassNameResolve.kt")
+        public void testSameClassNameResolve() throws Exception {
+            doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/sameClassNameResolve.kt");
+        }
+        
         @TestMetadata("simpleClass.kt")
         public void testSimpleClass() throws Exception {
             doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt");