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

Minor refactoring in JavaBaseScope

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-15 17:04:59 +04:00
parent 47a95471fa
commit 4d73e714bb
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
+16 -8
View File
@@ -20,6 +20,7 @@ import com.google.common.collect.Sets;
import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiPackage; import com.intellij.psi.PsiPackage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.java.*; import org.jetbrains.jet.lang.resolve.java.*;
import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData; import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData;
@@ -28,6 +29,9 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl;
import java.util.Collection; import java.util.Collection;
import static org.jetbrains.jet.lang.resolve.java.scope.ScopeUtils.computeAllClassDeclarations;
import static org.jetbrains.jet.lang.resolve.java.scope.ScopeUtils.computeAllPackageDeclarations;
public abstract class JavaBaseScope extends JetScopeImpl { public abstract class JavaBaseScope extends JetScopeImpl {
@NotNull @NotNull
@@ -35,8 +39,8 @@ public abstract class JavaBaseScope extends JetScopeImpl {
@NotNull @NotNull
protected final ResolverScopeData resolverScopeData; protected final ResolverScopeData resolverScopeData;
// cache @Nullable
private Collection<DeclarationDescriptor> allDescriptors; private Collection<DeclarationDescriptor> allDescriptors = null;
protected JavaBaseScope( protected JavaBaseScope(
@NotNull JavaSemanticServices semanticServices, @NotNull JavaSemanticServices semanticServices,
@@ -71,19 +75,23 @@ public abstract class JavaBaseScope extends JetScopeImpl {
return allDescriptors; return allDescriptors;
} }
allDescriptors = Sets.newHashSet(); allDescriptors = computeAllDescriptors();
return allDescriptors;
}
@NotNull
private Collection<DeclarationDescriptor> computeAllDescriptors() {
Collection<DeclarationDescriptor> result = Sets.newHashSet();
PsiClass psiClass = resolverScopeData.getPsiClass(); PsiClass psiClass = resolverScopeData.getPsiClass();
if (psiClass != null) { if (psiClass != null) {
allDescriptors.addAll( result.addAll(computeAllClassDeclarations(psiClass, semanticServices, resolverScopeData, getContainingDeclaration()));
ScopeUtils.computeAllClassDeclarations(psiClass, semanticServices, resolverScopeData, getContainingDeclaration()));
} }
PsiPackage psiPackage = resolverScopeData.getPsiPackage(); PsiPackage psiPackage = resolverScopeData.getPsiPackage();
if (psiPackage != null) { if (psiPackage != null) {
allDescriptors.addAll(ScopeUtils.computeAllPackageDeclarations(psiPackage, semanticServices, resolverScopeData.getFqName())); result.addAll(computeAllPackageDeclarations(psiPackage, semanticServices, resolverScopeData.getFqName()));
} }
return result;
return allDescriptors;
} }
} }