diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt index bed1f9f0cd1..fb626c31908 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractResolverForProject.kt @@ -8,15 +8,12 @@ package org.jetbrains.kotlin.analyzer import com.intellij.openapi.util.ModificationTracker import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.context.ProjectContext -import org.jetbrains.kotlin.context.withModule import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentProvider import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.platform.TargetPlatform -import org.jetbrains.kotlin.psi.KtFile abstract class AbstractResolverForProject( private val debugName: String, @@ -126,7 +123,7 @@ abstract class AbstractResolverForProject( } override fun diagnoseUnknownModuleInfo(infos: List): Nothing { - DiagnoseUnknownModuleInfoReporter.report(name, infos) + DiagnoseUnknownModuleInfoReporter.report(name, infos, allModules) } private fun checkModuleIsCorrect(moduleInfo: M) { @@ -207,8 +204,8 @@ private class DelegatingPackageFragmentProvider( } private object DiagnoseUnknownModuleInfoReporter { - fun report(name: String, infos: List): Nothing { - val message = "$name does not know how to resolve $infos" + fun report(name: String, infos: List, allModules: Collection): Nothing { + val message = "$name does not know how to resolve $infos, allModules: $allModules" when { name.contains(ResolverForProject.resolverForSdkName) -> errorInSdkResolver(message) name.contains(ResolverForProject.resolverForLibrariesName) -> errorInLibrariesResolver(message)