From f7f90c8592a683f1dd7fcb91d46348fd1a0074b8 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 17 Apr 2015 15:27:35 +0300 Subject: [PATCH] Minor. Renamed misleading function. --- .../idea/highlighter/markers/KotlinLineMarkerProvider.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 cf573893116..163521e427f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt @@ -75,8 +75,8 @@ public class KotlinLineMarkerProvider : LineMarkerProvider { } } - collectOverridingAccessors(functions, result) - collectOverridingPropertiesAccessors(properties, result) + collectOverriddenFunctions(functions, result) + collectOverriddenPropertyAccessors(properties, result) } } @@ -159,7 +159,7 @@ private fun collectInheritedClassMarker(element: JetClass, result: MutableCollec )) } -private fun collectOverridingPropertiesAccessors(properties: Collection, result: MutableCollection>) { +private fun collectOverriddenPropertyAccessors(properties: Collection, result: MutableCollection>) { val mappingToJava = Maps.newHashMap() for (property in properties) { if (property.isOverridable()) { @@ -190,7 +190,7 @@ private fun collectOverridingPropertiesAccessors(properties: Collection, result: MutableCollection>) { +private fun collectOverriddenFunctions(functions: Collection, result: MutableCollection>) { val mappingToJava = Maps.newHashMap() for (function in functions) { if (function.isOverridable()) {