private -> internal where it's necessary

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt

@@ -29,7 +29,7 @@ import com.intellij.psi.util.CachedValuesManager
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.utils.emptyOrSingletonList
-import java.util.LinkedHashSet
+import java.util.*
 
 public val LIBRARY_NAME_PREFIX: String = "library "
 
@@ -111,7 +111,7 @@ public data class ModuleTestSourceInfo(override val module: Module) : ModuleSour
     })
 }
 
-private fun ModuleSourceInfo.isTests() = this is ModuleTestSourceInfo
+internal fun ModuleSourceInfo.isTests() = this is ModuleTestSourceInfo
 
 public fun Module.productionSourceInfo(): ModuleProductionSourceInfo = ModuleProductionSourceInfo(this)
 public fun Module.testSourceInfo(): ModuleTestSourceInfo = ModuleTestSourceInfo(this)
@@ -160,7 +160,7 @@ public data class LibraryInfo(val project: Project, val library: Library) : Idea
     override fun toString() = "LibraryInfo(libraryName=${library.getName()})"
 }
 
-private data class LibrarySourceInfo(val project: Project, val library: Library) : IdeaModuleInfo() {
+internal data class LibrarySourceInfo(val project: Project, val library: Library) : IdeaModuleInfo() {
     override val name: Name = Name.special("<sources for library ${library.getName()}>")
 
     override fun contentScope() = GlobalSearchScope.EMPTY_SCOPE
@@ -184,7 +184,7 @@ public data class SdkInfo(val project: Project, val sdk: Sdk) : IdeaModuleInfo()
     override fun dependencies(): List<IdeaModuleInfo> = listOf(this)
 }
 
-private object NotUnderContentRootModuleInfo : IdeaModuleInfo() {
+internal object NotUnderContentRootModuleInfo : IdeaModuleInfo() {
     override val name: Name = Name.special("<special module for files not under source root>")
 
     override fun contentScope() = GlobalSearchScope.EMPTY_SCOPE
@@ -201,4 +201,4 @@ private data class LibraryWithoutSourceScope(project: Project, private val libra
 private data class SdkScope(project: Project, private val sdk: Sdk) :
         LibraryScopeBase(project, sdk.getRootProvider().getFiles(OrderRootType.CLASSES), arrayOf<VirtualFile>())
 
-private fun IdeaModuleInfo.isLibraryClasses() = this is SdkInfo || this is LibraryInfo
+internal fun IdeaModuleInfo.isLibraryClasses() = this is SdkInfo || this is LibraryInfo

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt

@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import org.jetbrains.kotlin.utils.keysToMap
 
-private val LOG = Logger.getInstance(javaClass<KotlinCacheService>())
+internal val LOG = Logger.getInstance(javaClass<KotlinCacheService>())
 
 public class KotlinCacheService(val project: Project) {
     companion object {

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt

@@ -38,9 +38,9 @@ import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
 import org.jetbrains.kotlin.resolve.*
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession
-import java.util.HashMap
+import java.util.*
 
-private class PerFileAnalysisCache(val file: JetFile, val componentProvider: ComponentProvider) {
+internal class PerFileAnalysisCache(val file: JetFile, val componentProvider: ComponentProvider) {
     private val cache = HashMap<PsiElement, AnalysisResult>()
 
     private fun lookUp(analyzableElement: JetElement): AnalysisResult? {

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt

@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.resolve.CompositeBindingContext
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 
-private class ProjectResolutionFacade(
+internal class ProjectResolutionFacade(
         val project: Project,
         computeModuleResolverProvider: () -> CachedValueProvider.Result<ModuleResolverProvider>
 ) {
@@ -85,7 +85,7 @@ private class ProjectResolutionFacade(
     }
 }
 
-private class ResolutionFacadeImpl(
+internal class ResolutionFacadeImpl(
         private val projectFacade: ProjectResolutionFacade,
         private val moduleInfo: IdeaModuleInfo
 ) : ResolutionFacade {
@@ -128,4 +128,4 @@ private class ResolutionFacadeImpl(
         return projectFacade.resolverForDescriptor(moduleDescriptor).componentProvider.getService(serviceClass)
     }
 
-}
+}

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt

@@ -74,7 +74,7 @@ class ClsStubBuilderContext(
         val typeParameters: TypeParameters
 )
 
-private fun ClsStubBuilderContext.child(typeParameterList: List<ProtoBuf.TypeParameter>, name: Name? = null): ClsStubBuilderContext {
+internal fun ClsStubBuilderContext.child(typeParameterList: List<ProtoBuf.TypeParameter>, name: Name? = null): ClsStubBuilderContext {
     return ClsStubBuilderContext(
             this.components,
             this.nameResolver,

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt

@@ -21,11 +21,11 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl
 import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl
 import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
+import org.jetbrains.kotlin.incremental.components.LookupLocation
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.scopes.JetScope
 import org.jetbrains.kotlin.resolve.scopes.JetScopeImpl
-import org.jetbrains.kotlin.incremental.components.LookupLocation
 import org.jetbrains.kotlin.types.ErrorUtils.createErrorType
 import org.jetbrains.kotlin.types.TypeProjection
 import org.jetbrains.kotlin.types.TypeSubstitution
@@ -54,7 +54,7 @@ private class ScopeWithMissingDependencies(val fqName: FqName, val containing: D
     }
 }
 
-private class PackageFragmentProviderForMissingDependencies(val moduleDescriptor: ModuleDescriptor) : PackageFragmentProvider {
+internal class PackageFragmentProviderForMissingDependencies(val moduleDescriptor: ModuleDescriptor) : PackageFragmentProvider {
     override fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor> {
         return listOf(PackageFragmentWithMissingDependencies(fqName, moduleDescriptor))
     }