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

JavaDescriptorFinder#getClassNames() returns empty list

Browse Source 
All classes are included in JavaPackageFragmentScopeForJavaPackageFragment  anyway
This commit is contained in:
Pavel V. Talanov
2014-06-16 15:00:57 +04:00
parent f4514b044e
commit a66353dbc4
4 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt
-2
View File
@@ -98,8 +98,6 @@ public class LazyJavaPackageFragmentProvider(
override fun getSubPackagesOf(fqName: FqName) = getPackageFragment(fqName)?.getMemberScope()?.getSubPackages().orEmpty() override fun getSubPackagesOf(fqName: FqName) = getPackageFragment(fqName)?.getMemberScope()?.getSubPackages().orEmpty()
override fun getClassNamesInPackage(packageName: FqName) = getPackageFragment(packageName)?.getMemberScope()?.getAllClassNames().orEmpty()
internal val resolveKotlinBinaryClass = c.storageManager.createMemoizedFunctionWithNullableValues { internal val resolveKotlinBinaryClass = c.storageManager.createMemoizedFunctionWithNullableValues {
(kotlinClass: KotlinJvmBinaryClass) -> c.deserializedDescriptorResolver.resolveClass(kotlinClass) (kotlinClass: KotlinJvmBinaryClass) -> c.deserializedDescriptorResolver.resolveClass(kotlinClass)
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt
-2
View File
@@ -56,8 +56,6 @@ public abstract class LazyJavaPackageFragmentScope(
} }
} }
public abstract override fun getAllClassNames(): Collection<Name>
// Package fragments are not nested // Package fragments are not nested
override fun getPackage(name: Name) = null override fun getPackage(name: Name) = null
abstract fun getSubPackages(): Collection<FqName> abstract fun getSubPackages(): Collection<FqName>
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProvider.java
-9
View File
@@ -18,24 +18,15 @@ package org.jetbrains.jet.lang.resolve.java.resolver;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider; import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPackageFragmentDescriptor; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPackageFragmentDescriptor;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.Collection;
public interface JavaPackageFragmentProvider extends PackageFragmentProvider { public interface JavaPackageFragmentProvider extends PackageFragmentProvider {
@Nullable @Nullable
JavaPackageFragmentDescriptor getPackageFragment(@NotNull FqName fqName); JavaPackageFragmentDescriptor getPackageFragment(@NotNull FqName fqName);
@NotNull
@ReadOnly
Collection<Name> getClassNamesInPackage(@NotNull FqName packageName);
@NotNull @NotNull
ModuleDescriptor getModule(); ModuleDescriptor getModule();
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDescriptorFinder.kt
+2 -1
View File
@@ -25,6 +25,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.jet.lang.types.DependencyClassByQualifiedNameResolver import org.jetbrains.jet.lang.types.DependencyClassByQualifiedNameResolver
import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.kotlinFqNameToJavaFqName import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.kotlinFqNameToJavaFqName
import java.util.Collections
public class JavaDescriptorFinder( public class JavaDescriptorFinder(
private val javaDescriptorResolver: DependencyClassByQualifiedNameResolver, private val javaDescriptorResolver: DependencyClassByQualifiedNameResolver,
@@ -36,6 +37,6 @@ public class JavaDescriptorFinder(
} }
override fun getClassNames(packageName: FqName): Collection<Name> { override fun getClassNames(packageName: FqName): Collection<Name> {
return javaPackageFragmentProvider.getClassNamesInPackage(packageName) return Collections.emptyList()
} }
} }