Even faster completion of root packages
This commit is contained in:
@@ -168,7 +168,7 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
|
||||
if (packageDescriptor == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return packageDescriptor.getDeclarationProvider().getAllDeclaredSubPackages();
|
||||
return packageDescriptor.getDeclarationProvider().getAllDeclaredSubPackages(nameFilter);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.name.Name
|
||||
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
|
||||
|
||||
public class CombinedPackageMemberDeclarationProvider(val providers: Collection<PackageMemberDeclarationProvider>) : PackageMemberDeclarationProvider {
|
||||
override fun getAllDeclaredSubPackages() = providers.flatMap { it.getAllDeclaredSubPackages() }
|
||||
override fun getAllDeclaredSubPackages(nameFilter: (Name) -> Boolean) = providers.flatMap { it.getAllDeclaredSubPackages(nameFilter) }
|
||||
|
||||
override fun getPackageFiles() = providers.flatMap { it.getPackageFiles() }
|
||||
|
||||
|
||||
+2
-1
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.resolve.lazy.declarations
|
||||
|
||||
import org.jetbrains.kotlin.psi.JetFile
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.name.Name
|
||||
import org.jetbrains.kotlin.storage.StorageManager
|
||||
|
||||
public class FileBasedPackageMemberDeclarationProvider internal constructor(
|
||||
@@ -40,7 +41,7 @@ public class FileBasedPackageMemberDeclarationProvider internal constructor(
|
||||
}
|
||||
}
|
||||
|
||||
override fun getAllDeclaredSubPackages(): Collection<FqName> = allDeclaredSubPackages()
|
||||
override fun getAllDeclaredSubPackages(nameFilter: (Name) -> Boolean): Collection<FqName> = allDeclaredSubPackages()
|
||||
|
||||
override fun getPackageFiles() = packageFiles
|
||||
|
||||
|
||||
+2
-1
@@ -19,9 +19,10 @@ package org.jetbrains.kotlin.resolve.lazy.declarations
|
||||
import org.jetbrains.annotations.ReadOnly
|
||||
import org.jetbrains.kotlin.psi.JetFile
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.name.Name
|
||||
|
||||
public trait PackageMemberDeclarationProvider : DeclarationProvider {
|
||||
public fun getAllDeclaredSubPackages(): Collection<FqName>
|
||||
public fun getAllDeclaredSubPackages(nameFilter: (Name) -> Boolean): Collection<FqName>
|
||||
|
||||
public fun getPackageFiles(): Collection<JetFile>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user