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

Better diagnostics for "no resolver for module descriptor" situation (EA-72838 - ISE: EmptyResolverForProject.resolverForModuleDescriptor)

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-12-02 16:10:20 +03:00
parent bd0aa5a358
commit 48513c7b1d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+6 -1
View File
@@ -93,7 +93,12 @@ class ResolverForProjectImpl<M : ModuleInfo>(
private fun isCorrectModuleInfo(moduleInfo: M) = moduleInfo in allModules private fun isCorrectModuleInfo(moduleInfo: M) = moduleInfo in allModules
override fun resolverForModuleDescriptor(descriptor: ModuleDescriptor): ResolverForModule { override fun resolverForModuleDescriptor(descriptor: ModuleDescriptor): ResolverForModule {
val computation = resolverByModuleDescriptor[descriptor] ?: return delegateResolver.resolverForModuleDescriptor(descriptor) val computation = resolverByModuleDescriptor[descriptor] ?: run {
if (delegateResolver is EmptyResolverForProject<*>) {
throw IllegalStateException("$descriptor is not contained in resolver $name")
}
return delegateResolver.resolverForModuleDescriptor(descriptor)
}
return computation() return computation()
} }