Useless method removed
Package fragments do not nest, do there's no need to account for subpackages in member scopes
This commit is contained in:
-1
@@ -189,7 +189,6 @@ public class LazyJavaClassMemberScope(
|
|||||||
|
|
||||||
// namespaces should be resolved elsewhere
|
// namespaces should be resolved elsewhere
|
||||||
override fun getPackage(name: Name) = null
|
override fun getPackage(name: Name) = null
|
||||||
override fun getAllPackageNames(): Collection<Name> = listOf()
|
|
||||||
|
|
||||||
override fun toString() = "Lazy java member scope for " + jClass.getFqName()
|
override fun toString() = "Lazy java member scope for " + jClass.getFqName()
|
||||||
}
|
}
|
||||||
-9
@@ -277,14 +277,6 @@ public abstract class LazyJavaMemberScope(
|
|||||||
private fun computeAllDescriptors(): MutableCollection<DeclarationDescriptor> {
|
private fun computeAllDescriptors(): MutableCollection<DeclarationDescriptor> {
|
||||||
val result = LinkedHashSet<DeclarationDescriptor>()
|
val result = LinkedHashSet<DeclarationDescriptor>()
|
||||||
|
|
||||||
for (name in getAllPackageNames()) {
|
|
||||||
val descriptor = getPackage(name)
|
|
||||||
if (descriptor != null) {
|
|
||||||
// Null signifies that a package found in Java is not present in Kotlin
|
|
||||||
result.add(descriptor)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (name in getAllClassNames()) {
|
for (name in getAllClassNames()) {
|
||||||
val descriptor = getClassifier(name)
|
val descriptor = getClassifier(name)
|
||||||
if (descriptor != null) {
|
if (descriptor != null) {
|
||||||
@@ -310,7 +302,6 @@ public abstract class LazyJavaMemberScope(
|
|||||||
// Do nothing
|
// Do nothing
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract fun getAllPackageNames(): Collection<Name>
|
|
||||||
protected abstract fun getAllClassNames(): Collection<Name>
|
protected abstract fun getAllClassNames(): Collection<Name>
|
||||||
|
|
||||||
override fun toString() = "Lazy scope for ${getContainingDeclaration()}"
|
override fun toString() = "Lazy scope for ${getContainingDeclaration()}"
|
||||||
|
|||||||
-1
@@ -58,7 +58,6 @@ public abstract class LazyJavaPackageFragmentScope(
|
|||||||
|
|
||||||
// Package fragments are not nested
|
// Package fragments are not nested
|
||||||
override fun getPackage(name: Name) = null
|
override fun getPackage(name: Name) = null
|
||||||
final override fun getAllPackageNames() = listOf<Name>()
|
|
||||||
abstract fun getSubPackages(): Collection<FqName>
|
abstract fun getSubPackages(): Collection<FqName>
|
||||||
|
|
||||||
override fun getImplicitReceiversHierarchy(): List<ReceiverParameterDescriptor> = listOf()
|
override fun getImplicitReceiversHierarchy(): List<ReceiverParameterDescriptor> = listOf()
|
||||||
|
|||||||
Reference in New Issue
Block a user