From b3e9a78f456884a176a25257666e9ab66f2de6af Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Mon, 5 Nov 2012 14:08:07 +0400
Subject: [PATCH] Rename: NamespaceScopeData -> PackagePsiDeclarationImpl

---
 .../java/data/KotlinNamespacePsiDeclarationProvider.java   | 2 +-
 ...aceData.java => PackagePsiDeclarationProviderImpl.java} | 7 ++++---
 .../resolve/java/data/PsiDeclarationProviderFactory.java   | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/{ResolverNamespaceData.java => PackagePsiDeclarationProviderImpl.java} (80%)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/KotlinNamespacePsiDeclarationProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/KotlinNamespacePsiDeclarationProvider.java
index 227a0f2afa7..59b503cce5f 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/KotlinNamespacePsiDeclarationProvider.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/KotlinNamespacePsiDeclarationProvider.java
@@ -33,7 +33,7 @@ public final class KotlinNamespacePsiDeclarationProvider extends ClassPsiDeclara
             @NotNull PsiClass psiClass
     ) {
         super(psiClass, true);
-        this.packagePsiDeclarationProvider = new ResolverNamespaceData(psiPackage);
+        this.packagePsiDeclarationProvider = PsiDeclarationProviderFactory.createDeclarationProviderForNamespaceWithoutMembers(psiPackage);
     }
 
     @NotNull
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverNamespaceData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PackagePsiDeclarationProviderImpl.java
similarity index 80%
rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverNamespaceData.java
rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PackagePsiDeclarationProviderImpl.java
index e444856750c..70c3f01ba60 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverNamespaceData.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PackagePsiDeclarationProviderImpl.java
@@ -21,13 +21,14 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.java.MembersCache;
 
 import static org.jetbrains.jet.lang.resolve.java.data.Origin.JAVA;
+import static org.jetbrains.jet.lang.resolve.java.data.Origin.KOTLIN;
 
-public class ResolverNamespaceData extends PsiDeclarationProviderBase implements PackagePsiDeclarationProvider {
+public final class PackagePsiDeclarationProviderImpl extends PsiDeclarationProviderBase implements PackagePsiDeclarationProvider {
 
     @NotNull
     private final PsiPackage psiPackage;
 
-    protected ResolverNamespaceData(
+    /*package private*/ PackagePsiDeclarationProviderImpl(
             @NotNull PsiPackage psiPackage
     ) {
         this.psiPackage = psiPackage;
@@ -42,7 +43,7 @@ public class ResolverNamespaceData extends PsiDeclarationProviderBase implements
     @NotNull
     @Override
     protected MembersCache buildMembersCache() {
-        return MembersCache.buildMembersByNameCache(new MembersCache(), null, getPsiPackage(), true, false);
+        return MembersCache.buildMembersByNameCache(new MembersCache(), null, getPsiPackage(), true, getOrigin() == KOTLIN);
     }
 
     @NotNull
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProviderFactory.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProviderFactory.java
index b09156b3fea..4a3c137439d 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProviderFactory.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProviderFactory.java
@@ -73,8 +73,8 @@ public final class PsiDeclarationProviderFactory {
     }
 
     @NotNull
-    private static PsiDeclarationProvider createDeclarationProviderForNamespaceWithoutMembers(@NotNull PsiPackage psiPackage) {
-        return new ResolverNamespaceData(psiPackage);
+    /*package private*/ static PackagePsiDeclarationProvider createDeclarationProviderForNamespaceWithoutMembers(@NotNull PsiPackage psiPackage) {
+        return new PackagePsiDeclarationProviderImpl(psiPackage);
     }
 
     @NotNull