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

AA FE1.0: restore an option to register AnalysisHandlerExtension w/o use-site module

Browse Source
This commit is contained in:
Jinseong Jeon
2023-07-06 22:44:16 -07:00
committed by Ilya Kirillov
parent 4f3ecedbca
commit 2dee644f7a
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/CliFe10AnalysisFacade.kt
+13 -5
View File
@@ -74,12 +74,15 @@ class CliFe10AnalysisFacade : Fe10AnalysisFacade {
}
}
class KtFe10AnalysisHandlerExtension(private val useSiteModule: KtSourceModule) : AnalysisHandlerExtension {
class KtFe10AnalysisHandlerExtension(
private val useSiteModule: KtSourceModule? = null
) : AnalysisHandlerExtension {
internal companion object {
fun getInstance(area: AreaInstance, module: KtModule): KtFe10AnalysisHandlerExtension {
return AnalysisHandlerExtension.extensionPointName.getExtensions(area)
val extensions = AnalysisHandlerExtension.extensionPointName.getExtensions(area)
.filterIsInstance<KtFe10AnalysisHandlerExtension>()
.firstOrNull { it.useSiteModule == module }
return extensions.firstOrNull { it.useSiteModule == module }
?: extensions.singleOrNull { it.useSiteModule == null }
?: error(KtFe10AnalysisHandlerExtension::class.java.name + " should be registered")
}
}
@@ -110,9 +113,14 @@ class KtFe10AnalysisHandlerExtension(private val useSiteModule: KtSourceModule)
bindingTrace: BindingTrace,
componentProvider: ComponentProvider
): AnalysisResult? {
if (module.name.asString().removeSurrounding("<", ">") != useSiteModule.moduleName) {
// Single-module [KtFe10AnalysisHandlerExtension] can be registered without specific use-site module.
// Simple null-check below will skip the bail-out.
if (useSiteModule != null &&
module.name.asString().removeSurrounding("<", ">") != useSiteModule.moduleName
) {
// there is no way to properly map KtModule to ModuleDescriptor,
// KtFe10AnalysisHandlerExtension is used only for tests, so just by name comparasion should work as all module names are different
// Multi-module [KtFe10AnalysisHandlerExtension]s are used only for tests,
// so just by name comparison should work as all module names are different
return null
}