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

Refactor: remove ResolverScopeData#getFqName()

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-11-04 22:11:20 +04:00
parent db5c04b360
commit 35f28e7684
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverScopeData.java
+1 -8
View File
@@ -41,11 +41,6 @@ public abstract class ResolverScopeData {
return psiPackage; return psiPackage;
} }
@Nullable
public FqName getFqName() {
return fqName;
}
public boolean isStaticMembers() { public boolean isStaticMembers() {
return staticMembers; return staticMembers;
} }
@@ -58,8 +53,6 @@ public abstract class ResolverScopeData {
private final PsiClass psiClass; private final PsiClass psiClass;
@Nullable @Nullable
private final PsiPackage psiPackage; private final PsiPackage psiPackage;
@Nullable
private final FqName fqName;
private final boolean staticMembers; private final boolean staticMembers;
private final boolean kotlin; private final boolean kotlin;
@@ -73,7 +66,6 @@ public abstract class ResolverScopeData {
this.psiClass = psiClass; this.psiClass = psiClass;
this.psiPackage = psiPackage; this.psiPackage = psiPackage;
this.fqName = fqName;
if (psiClass == null && psiPackage == null) { if (psiClass == null && psiPackage == null) {
throw new IllegalStateException("both psiClass and psiPackage cannot be null"); throw new IllegalStateException("both psiClass and psiPackage cannot be null");
@@ -82,6 +74,7 @@ public abstract class ResolverScopeData {
this.staticMembers = staticMembers; this.staticMembers = staticMembers;
this.kotlin = psiClass != null && DescriptorResolverUtils.isKotlinClass(psiClass); this.kotlin = psiClass != null && DescriptorResolverUtils.isKotlinClass(psiClass);
//TODO: move check to remove fqName parameter
if (fqName != null && fqName.lastSegmentIs(Name.identifier(JvmAbi.PACKAGE_CLASS)) && psiClass != null && kotlin) { if (fqName != null && fqName.lastSegmentIs(Name.identifier(JvmAbi.PACKAGE_CLASS)) && psiClass != null && kotlin) {
throw new IllegalStateException("Kotlin namespace cannot have last segment " + JvmAbi.PACKAGE_CLASS + ": " + fqName); throw new IllegalStateException("Kotlin namespace cannot have last segment " + JvmAbi.PACKAGE_CLASS + ": " + fqName);
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
+4 -5
View File
@@ -23,10 +23,8 @@ 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.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
import org.jetbrains.jet.lang.resolve.java.NamedMembers; import org.jetbrains.jet.lang.resolve.java.NamedMembers;
import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData; import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData;
@@ -142,7 +140,8 @@ public abstract class JavaBaseScope extends JetScopeImpl {
PsiPackage psiPackage = resolverScopeData.getPsiPackage(); PsiPackage psiPackage = resolverScopeData.getPsiPackage();
if (psiPackage != null) { if (psiPackage != null) {
result.addAll(computeAllPackageDeclarations(psiPackage, semanticServices, resolverScopeData.getFqName())); assert descriptor instanceof NamespaceDescriptor;
result.addAll(computeAllPackageDeclarations(psiPackage, semanticServices, DescriptorUtils.getFQName(descriptor).toSafe()));
} }
return result; return result;
} }