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

Removed redundant code.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-06 17:48:36 +04:00
parent e943b9c9ab
commit 6508f88552
2 changed files with 3 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/scope/JavaPackageScope.java
+1 -4
View File
@@ -21,7 +21,6 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule;
import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
import org.jetbrains.jet.lang.resolve.java.provider.PackagePsiDeclarationProvider;
@@ -79,9 +78,7 @@ public abstract class JavaPackageScope extends JavaBaseScope {
@Override
protected Collection<DeclarationDescriptor> computeAllDescriptors() {
Collection<DeclarationDescriptor> result = super.computeAllDescriptors();
result.addAll(computeAllPackageDeclarations(declarationProvider.getPsiPackage(),
semanticServices,
DescriptorUtils.getFQName(descriptor).toSafe()));
result.addAll(computeAllPackageDeclarations(declarationProvider.getPsiPackage(), semanticServices));
return result;
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/ScopeUtils.java
+2 -9
View File
@@ -37,11 +37,9 @@ public final class ScopeUtils {
@NotNull
public static Collection<DeclarationDescriptor> computeAllPackageDeclarations(
PsiPackage psiPackage,
JavaSemanticServices javaSemanticServices,
FqName packageFqName
JavaSemanticServices javaSemanticServices
) {
Collection<DeclarationDescriptor> result = Sets.newHashSet();
boolean isKotlinNamespace = packageFqName != null && javaSemanticServices.getKotlinNamespaceDescriptor(packageFqName) != null;
final JavaDescriptorResolver descriptorResolver = javaSemanticServices.getDescriptorResolver();
for (PsiPackage psiSubPackage : psiPackage.getSubPackages()) {
@@ -53,7 +51,7 @@ public final class ScopeUtils {
}
for (PsiClass psiClass : javaSemanticServices.getPsiClassFinder().findPsiClasses(psiPackage)) {
if (isKotlinNamespace && PackageClassUtils.isPackageClass(psiClass)) {
if (PackageClassUtils.isPackageClass(psiClass)) {
continue;
}
@@ -61,11 +59,6 @@ public final class ScopeUtils {
continue;
}
// TODO: Temp hack for collection function descriptors from java
if (PackageClassUtils.isPackageClass(psiClass)) {
continue;
}
if (psiClass.hasModifierProperty(PsiModifier.PUBLIC)) {
ProgressIndicatorProvider.checkCanceled();
ClassDescriptor classDescriptor = descriptorResolver