Replace deprecated toMap usages with toMapBy

compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Conditional.kt

@@ -47,7 +47,7 @@ interface Conditional {
 
 
     companion object {
-        val ANNOTATIONS: Map<String, Parser> = listOf<Parser>(JvmVersion, JsVersion, TargetName).toMap { it.name }
+        val ANNOTATIONS: Map<String, Parser> = listOf<Parser>(JvmVersion, JsVersion, TargetName).toMapBy { it.name }
     }
 }
 

compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt

@@ -67,7 +67,7 @@ public interface AbstractSMAPBaseTest {
         }.map {
             val smap = it.getValue().mapNotNull { it.smap?.replaceHash() }.joinToString("\n")
             SMAPAndFile(if (smap.isNotEmpty()) smap else null, it.key)
-        }.toMap { it.sourceFile }
+        }.toMapBy { it.sourceFile }
 
         for (source in sourceData) {
             val data = compiledData[source.sourceFile]

idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt

@@ -2,4 +2,4 @@ fun foo(list: List<String>) {
     list.<caret>
 }
 // EXIST: { itemText: "firstOrNull", tailText: " {...} (predicate: (String) -> Boolean) for Iterable<T> in kotlin", typeText: "String?" }
-// EXIST: { itemText: "toMap", tailText: " {...} (selector: (String) -> K) for Iterable<T> in kotlin", typeText: "Map<K, String>" }
+// EXIST: { itemText: "toMapBy", tailText: " {...} (selector: (String) -> K) for Iterable<T> in kotlin", typeText: "Map<K, String>" }

idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt

@@ -52,7 +52,7 @@ public fun Call.mapArgumentsToParameters(targetDescriptor: CallableDescriptor):
     if (parameters.isEmpty()) return emptyMap()
 
     val map = HashMap<ValueArgument, ValueParameterDescriptor>()
-    val parametersByName = parameters.toMap { it.getName() }
+    val parametersByName = parameters.toMapBy { it.getName() }
 
     var positionalArgumentIndex: Int? = 0
 

idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt

@@ -61,7 +61,7 @@ public abstract class AbstractMemberPullPushTest : KotlinLightCodeInsightFixture
         val extraFiles = mainFile.parentFile.listFiles { file, name ->
             name != mainFileName && name.startsWith("$mainFileBaseName.") && (name.endsWith(".kt") || name.endsWith(".java"))
         }
-        val extraFilesToPsi = extraFiles.toMap { fixture.configureByFile(it.getName()) }
+        val extraFilesToPsi = extraFiles.toMapBy { fixture.configureByFile(it.getName()) }
         val file = fixture.configureByFile(mainFileName)
 
         val addKotlinRuntime = InTextDirectivesUtils.findStringWithPrefixes(file.text, "// WITH_RUNTIME") != null

idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt

@@ -319,7 +319,7 @@ public abstract class AbstractExtractionTest() : KotlinLightCodeInsightFixtureTe
         val extraFiles = mainFile.getParentFile().listFiles { file, name ->
             name != mainFileName && name.startsWith("$mainFileBaseName.") && (name.endsWith(".kt") || name.endsWith(".java"))
         }
-        val extraFilesToPsi = extraFiles.toMap { fixture.configureByFile(it.getName()) }
+        val extraFilesToPsi = extraFiles.toMapBy { fixture.configureByFile(it.getName()) }
         val file = fixture.configureByFile(mainFileName)
 
         val addKotlinRuntime = InTextDirectivesUtils.findStringWithPrefixes(file.getText(), "// WITH_RUNTIME") != null

jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt

@@ -36,8 +36,8 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() {
         val oldClassFiles = compileFileAndGetClasses(testDataPath, testDir, "old")
         val newClassFiles = compileFileAndGetClasses(testDataPath, testDir, "new")
 
-        val oldClassMap = oldClassFiles.toMap { it.name }
+        val oldClassMap = oldClassFiles.toMapBy { it.name }
-        val newClassMap = newClassFiles.toMap { it.name }
+        val newClassMap = newClassFiles.toMapBy { it.name }
 
         val sb = StringBuilder()
         val p = Printer(sb)

libraries/stdlib/src/kotlin/text/CharCategoryJVM.kt

@@ -161,7 +161,7 @@ public enum class CharCategory(public val value: Int, public val code: String) {
 
 
     public companion object {
-        private val categoryMap by lazy { CharCategory.values().toMap { it.value } }
+        private val categoryMap by lazy { CharCategory.values().toMapBy { it.value } }
 
         public fun valueOf(category: Int): CharCategory = categoryMap[category] ?: throw IllegalArgumentException("Category #$category is not defined.")
     }

libraries/stdlib/src/kotlin/text/CharDirectionalityJVM.kt

@@ -110,7 +110,7 @@ public enum class CharDirectionality(public val value: Int) {
 
 
     public companion object {
-        private val directionalityMap by lazy { CharDirectionality.values().toMap { it.value } }
+        private val directionalityMap by lazy { CharDirectionality.values().toMapBy { it.value } }
 
         public fun valueOf(directionality: Int): CharDirectionality = directionalityMap[directionality] ?: throw IllegalArgumentException("Directionality #$directionality is not defined.")
     }

libraries/tools/idl2k/src/main/kotlin/gen.kt

@@ -170,11 +170,11 @@ fun mapDefinitions(repository: Repository, definitions: Iterable<InterfaceDefini
         definitions.filter { "NoInterfaceObject" !in it.extendedAttributes.map { it.call } }.map { generateTrait(repository, it) }
 
 fun generateUnions(ifaces: List<GenerateTraitOrClass>, typedefs: Iterable<TypedefDefinition>): GenerateUnionTypes {
-    val declaredTypes = ifaces.toMap { it.name }
+    val declaredTypes = ifaces.toMapBy { it.name }
 
     val anonymousUnionTypes = collectUnionTypes(declaredTypes)
     val anonymousUnionTypeTraits = generateUnionTypeTraits(anonymousUnionTypes)
-    val anonymousUnionsMap = anonymousUnionTypeTraits.toMap { it.name }
+    val anonymousUnionsMap = anonymousUnionTypeTraits.toMapBy { it.name }
 
     val typedefsToBeGenerated = typedefs.filter { it.types is UnionType }
             .map { NamedValue(it.name, it.types as UnionType) }

libraries/tools/idl2k/src/main/kotlin/render.kt

@@ -227,7 +227,7 @@ private fun Pair<String, String>.betterName() = if (((0..9).map { it.toString()
 fun <K, V> List<Pair<K, V>>.toMultiMap(): Map<K, List<V>> = groupBy { it.first }.mapValues { it.value.map { it.second } }
 
 fun Appendable.render(namespace: String, ifaces: List<GenerateTraitOrClass>, unions : GenerateUnionTypes) {
-    val declaredTypes = ifaces.toMap { it.name }
+    val declaredTypes = ifaces.toMapBy { it.name }
 
     val allTypes = declaredTypes + unions.anonymousUnionsMap + unions.typedefsMarkersMap
     declaredTypes.values.filter { it.namespace == namespace }.forEach {