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

[AA] createDeclarationProvider: Rename module to contextualModule

Browse Source 
^KTIJ-27411
This commit is contained in:
Marco Pennekamp
2023-10-16 20:15:01 +02:00
committed by Space Team
parent a77349edb4
commit 2ec77822e2
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/KotlinDeclarationProvider.kt
+10 -2
View File
@@ -74,8 +74,16 @@ public abstract class KotlinDeclarationProviderMerger : KotlinComposableProvider
}
}
public fun Project.createDeclarationProvider(scope: GlobalSearchScope, module: KtModule?): KotlinDeclarationProvider =
KotlinDeclarationProviderFactory.getInstance(this).createDeclarationProvider(scope, module)
/**
* Creates a [KotlinDeclarationProvider] providing symbols within the given [scope] in the context of the given [contextualModule].
*
* The contextual module is the [KtModule]
*
* TODO (marco): Document that `contextualModule` may also be used as a base for calculating the "package name set", in addition to outsider
* module stuff. (Not sure how deep into detail we should go here, since it's an implementation detail.)
*/
public fun Project.createDeclarationProvider(scope: GlobalSearchScope, contextualModule: KtModule?): KotlinDeclarationProvider =
KotlinDeclarationProviderFactory.getInstance(this).createDeclarationProvider(scope, contextualModule)
public fun Project.mergeDeclarationProviders(declarationProviders: List<KotlinDeclarationProvider>): KotlinDeclarationProvider =
KotlinDeclarationProviderMerger.getInstance(this).merge(declarationProviders)
analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/impl/KotlinStaticDeclarationProvider.kt
+1 -1
View File
@@ -378,7 +378,7 @@ public class KotlinStaticDeclarationProviderMerger(private val project: Project)
override fun merge(providers: List<KotlinDeclarationProvider>): KotlinDeclarationProvider =
providers.mergeSpecificProviders<_, KotlinStaticDeclarationProvider>(CompositeKotlinDeclarationProvider.factory) { targetProviders ->
val combinedScope = GlobalSearchScope.union(targetProviders.map { it.scope })
project.createDeclarationProvider(combinedScope, module = null).apply {
project.createDeclarationProvider(combinedScope, contextualModule = null).apply {
check(this is KotlinStaticDeclarationProvider) {
"`KotlinStaticDeclarationProvider` can only be merged into a combined declaration provider of the same type."
}