From f139847e4712f2a969bc05cca4478d5b34894495 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 7 Jun 2018 15:39:39 +0300 Subject: [PATCH] Cleanup: KotlinLineMarkerProvider --- .../idea/highlighter/markers/KotlinLineMarkerProvider.kt | 6 +++--- .../highlighter/markers/KotlinLineMarkerProvider.kt.172 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt index 27529e1e5a6..eb514906b6a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt @@ -307,7 +307,7 @@ private fun collectOverriddenPropertyAccessors( val mappingToJava = HashMap() for (property in properties) { if (property.isOverridable()) { - property.toPossiblyFakeLightMethods().forEach { mappingToJava.put(it, property) } + property.toPossiblyFakeLightMethods().forEach { mappingToJava[it] = property } mappingToJava[property] = property } } @@ -410,9 +410,9 @@ private fun collectOverriddenFunctions(functions: Collection, r if (function.isOverridable()) { val method = LightClassUtil.getLightClassMethod(function) ?: KtFakeLightMethod.get(function) if (method != null) { - mappingToJava.put(method, function) + mappingToJava[method] = function } - mappingToJava.put(function, function) + mappingToJava[function] = function } } diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt.172 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt.172 index 30176c666d9..3fd13b0109f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt.172 +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt.172 @@ -298,7 +298,7 @@ private fun collectOverriddenPropertyAccessors( val mappingToJava = HashMap() for (property in properties) { if (property.isOverridable()) { - property.toPossiblyFakeLightMethods().forEach { mappingToJava.put(it, property) } + property.toPossiblyFakeLightMethods().forEach { mappingToJava[it] = property } mappingToJava[property] = property } } @@ -401,9 +401,9 @@ private fun collectOverriddenFunctions(functions: Collection, r if (function.isOverridable()) { val method = LightClassUtil.getLightClassMethod(function) ?: KtFakeLightMethod.get(function) if (method != null) { - mappingToJava.put(method, function) + mappingToJava[method] = function } - mappingToJava.put(function, function) + mappingToJava[function] = function } }