* Add getDeclarationsFromPackage to entry points in incremental docum…

…ent. * Reorganized getDeclarationsFromPackage implementation.
google · Apr 7, 2021 · 5dabde2 · 5dabde2
1 parent 1d73c9f
commit 5dabde2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/ResolverImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/ResolverImpl.kt
@@ -598,11 +598,11 @@ class ResolverImpl(
 
     @KspExperimental
     override fun getDeclarationsFromPackage(packageName: String): Sequence<KSDeclaration> {
-        module.getPackage(FqName(packageName)).memberScope
-        val res = (module as ModuleDescriptorImpl).packageFragmentProvider.packageFragments(FqName(packageName))
-            .flatMap{ it.getMemberScope().getContributedDescriptors() }
+        val noPackageFilter = DescriptorKindFilter.ALL.withoutKinds(DescriptorKindFilter.PACKAGES_MASK)
+        return module.getPackage(FqName(packageName))
+            .memberScope.getContributedDescriptors(noPackageFilter)
             .mapNotNull { (it as? MemberDescriptor)?.toKSDeclaration() }
-        return res.asSequence()
+            .asSequence()
     }
 
     override fun getTypeArgument(typeRef: KSTypeReference, variance: Variance): KSTypeArgument {

diff --git a/docs/incremental.md b/docs/incremental.md
@@ -13,6 +13,7 @@ words, a processor needs to associate an output with the sources of the correspo
 * `Resolver.getAllFiles`
 * `Resolver.getSymbolsWithAnnotation`
 * `Resolver.getClassDeclarationByName`
+* `Resolver.getDeclarationsFromPackage`
 
 Currently, only changes in Kotlin and Java sources are tracked. Changes to the classpath, namely to other modules
 or libraries, trigger a full re-processing of all sources.