From ea60ab74a759edf996dee2f42af1ea9c62090ab1 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 30 Nov 2015 04:00:31 +0300 Subject: [PATCH] Replace deprecated toMap usages with toMapBy --- .../src/org.jetbrains.kotlin.preprocessor/Conditional.kt | 2 +- .../org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt | 2 +- .../common/substitutedSignature/SubstitutedSignature3.kt | 2 +- idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt | 2 +- .../kotlin/idea/refactoring/AbstractMemberPullPushTest.kt | 2 +- .../idea/refactoring/introduce/AbstractExtractionTest.kt | 2 +- .../kotlin/jps/incremental/AbstractProtoComparisonTest.kt | 4 ++-- libraries/stdlib/src/kotlin/text/CharCategoryJVM.kt | 2 +- libraries/stdlib/src/kotlin/text/CharDirectionalityJVM.kt | 2 +- libraries/tools/idl2k/src/main/kotlin/gen.kt | 4 ++-- libraries/tools/idl2k/src/main/kotlin/render.kt | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Conditional.kt b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Conditional.kt index 1491be8a7f2..e8d29863ef9 100644 --- a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Conditional.kt +++ b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Conditional.kt @@ -47,7 +47,7 @@ interface Conditional { companion object { - val ANNOTATIONS: Map = listOf(JvmVersion, JsVersion, TargetName).toMap { it.name } + val ANNOTATIONS: Map = listOf(JvmVersion, JsVersion, TargetName).toMapBy { it.name } } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt index 6deb81d5434..8c670a611e0 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt +++ b/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] diff --git a/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt b/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt index f0af4361c6c..ac124465ef7 100644 --- a/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt +++ b/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt @@ -2,4 +2,4 @@ fun foo(list: List) { list. } // EXIST: { itemText: "firstOrNull", tailText: " {...} (predicate: (String) -> Boolean) for Iterable in kotlin", typeText: "String?" } -// EXIST: { itemText: "toMap", tailText: " {...} (selector: (String) -> K) for Iterable in kotlin", typeText: "Map" } +// EXIST: { itemText: "toMapBy", tailText: " {...} (selector: (String) -> K) for Iterable in kotlin", typeText: "Map" } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt index 26606f133c9..0aba63dd828 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt +++ b/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() - val parametersByName = parameters.toMap { it.getName() } + val parametersByName = parameters.toMapBy { it.getName() } var positionalArgumentIndex: Int? = 0 diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt index 692a88504ce..0b81fd88633 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt +++ b/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 diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt index 5374f4b661d..576615f7b86 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt +++ b/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 diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index d0dca0e7497..0a80f2626bc 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/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 newClassMap = newClassFiles.toMap { it.name } + val oldClassMap = oldClassFiles.toMapBy { it.name } + val newClassMap = newClassFiles.toMapBy { it.name } val sb = StringBuilder() val p = Printer(sb) diff --git a/libraries/stdlib/src/kotlin/text/CharCategoryJVM.kt b/libraries/stdlib/src/kotlin/text/CharCategoryJVM.kt index 09713795c58..87007f47e20 100644 --- a/libraries/stdlib/src/kotlin/text/CharCategoryJVM.kt +++ b/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.") } diff --git a/libraries/stdlib/src/kotlin/text/CharDirectionalityJVM.kt b/libraries/stdlib/src/kotlin/text/CharDirectionalityJVM.kt index a73593cf679..968a29f9b14 100644 --- a/libraries/stdlib/src/kotlin/text/CharDirectionalityJVM.kt +++ b/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.") } diff --git a/libraries/tools/idl2k/src/main/kotlin/gen.kt b/libraries/tools/idl2k/src/main/kotlin/gen.kt index 338e7b50efb..85b46916866 100644 --- a/libraries/tools/idl2k/src/main/kotlin/gen.kt +++ b/libraries/tools/idl2k/src/main/kotlin/gen.kt @@ -170,11 +170,11 @@ fun mapDefinitions(repository: Repository, definitions: Iterable, typedefs: Iterable): 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) } diff --git a/libraries/tools/idl2k/src/main/kotlin/render.kt b/libraries/tools/idl2k/src/main/kotlin/render.kt index dd11c7c3aa0..e42c05c6cb2 100644 --- a/libraries/tools/idl2k/src/main/kotlin/render.kt +++ b/libraries/tools/idl2k/src/main/kotlin/render.kt @@ -227,7 +227,7 @@ private fun Pair.betterName() = if (((0..9).map { it.toString() fun List>.toMultiMap(): Map> = groupBy { it.first }.mapValues { it.value.map { it.second } } fun Appendable.render(namespace: String, ifaces: List, 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 {