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

Rename: NamespaceScopeData -> PackagePsiDeclarationImpl

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-11-05 14:08:07 +04:00
parent f0b99848ec
commit b3e9a78f45
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/KotlinNamespacePsiDeclarationProvider.java
+1 -1
View File
@@ -33,7 +33,7 @@ public final class KotlinNamespacePsiDeclarationProvider extends ClassPsiDeclara
@NotNull PsiClass psiClass @NotNull PsiClass psiClass
) { ) {
super(psiClass, true); super(psiClass, true);
this.packagePsiDeclarationProvider = new ResolverNamespaceData(psiPackage); this.packagePsiDeclarationProvider = PsiDeclarationProviderFactory.createDeclarationProviderForNamespaceWithoutMembers(psiPackage);
} }
@NotNull @NotNull
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverNamespaceData.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PackagePsiDeclarationProviderImpl.java
+4 -3
View File
@@ -21,13 +21,14 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.MembersCache; 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.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 @NotNull
private final PsiPackage psiPackage; private final PsiPackage psiPackage;
protected ResolverNamespaceData( /*package private*/ PackagePsiDeclarationProviderImpl(
@NotNull PsiPackage psiPackage @NotNull PsiPackage psiPackage
) { ) {
this.psiPackage = psiPackage; this.psiPackage = psiPackage;
@@ -42,7 +43,7 @@ public class ResolverNamespaceData extends PsiDeclarationProviderBase implements
@NotNull @NotNull
@Override @Override
protected MembersCache buildMembersCache() { protected MembersCache buildMembersCache() {
return MembersCache.buildMembersByNameCache(new MembersCache(), null, getPsiPackage(), true, false); return MembersCache.buildMembersByNameCache(new MembersCache(), null, getPsiPackage(), true, getOrigin() == KOTLIN);
} }
@NotNull @NotNull
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProviderFactory.java
+2 -2
View File
@@ -73,8 +73,8 @@ public final class PsiDeclarationProviderFactory {
} }
@NotNull @NotNull
private static PsiDeclarationProvider createDeclarationProviderForNamespaceWithoutMembers(@NotNull PsiPackage psiPackage) { /*package private*/ static PackagePsiDeclarationProvider createDeclarationProviderForNamespaceWithoutMembers(@NotNull PsiPackage psiPackage) {
return new ResolverNamespaceData(psiPackage); return new PackagePsiDeclarationProviderImpl(psiPackage);
} }
@NotNull @NotNull