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

Remove unused package declaration provider

Browse Source
This commit is contained in:
Nikolay Krasko
2013-01-14 22:08:25 +04:00
parent 1263919e39
commit 303a613389
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java
+4 -8
View File
@@ -24,33 +24,29 @@ import org.jetbrains.jet.lang.resolve.java.PsiClassFinder;
import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN;
public final class KotlinNamespacePsiDeclarationProvider extends ClassPsiDeclarationProviderImpl implements PackagePsiDeclarationProvider {
@NotNull
private final PackagePsiDeclarationProvider packagePsiDeclarationProvider;
private final PsiPackage psiPackage;
public KotlinNamespacePsiDeclarationProvider(
@NotNull PsiPackage psiPackage,
@NotNull PsiClass psiClass,
@NotNull PsiDeclarationProviderFactory factory,
@NotNull PsiClassFinder psiClassFinder
) {
super(psiClass, true, psiClassFinder);
// TODO: remove?
this.packagePsiDeclarationProvider = factory.createDeclarationProviderForNamespaceWithoutMembers(psiPackage);
this.psiPackage = psiPackage;
}
@NotNull
@Override
public PsiPackage getPsiPackage() {
return packagePsiDeclarationProvider.getPsiPackage();
return psiPackage;
}
@NotNull
@Override
protected MembersCache buildMembersCache() {
MembersCache cacheWithMembers = super.buildMembersCache();
MembersCache.buildMembersByNameCache(cacheWithMembers, psiClassFinder, null, packagePsiDeclarationProvider.getPsiPackage(), true, getDeclarationOrigin() == KOTLIN);
MembersCache.buildMembersByNameCache(cacheWithMembers, psiClassFinder, null, psiPackage, true, getDeclarationOrigin() == KOTLIN);
return cacheWithMembers;
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java
+1 -1
View File
@@ -41,7 +41,7 @@ public final class PsiDeclarationProviderFactory {
@NotNull
public KotlinNamespacePsiDeclarationProvider createDeclarationForKotlinNamespace(
@NotNull PsiPackage psiPackage, @NotNull PsiClass psiClass) {
return new KotlinNamespacePsiDeclarationProvider(psiPackage, psiClass, this, psiClassFinder);
return new KotlinNamespacePsiDeclarationProvider(psiPackage, psiClass, psiClassFinder);
}
@NotNull