From 495a3e94327d55ea189141a8b665e3d9c2a30693 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 25 May 2016 21:05:59 +0200
Subject: [PATCH] cleanup after code review

---
 .../BeforeResolveHighlightingVisitor.kt       |  2 +-
 .../FunctionsHighlightingVisitor.kt           |  4 +--
 .../idea/highlighter/NameHighlighter.kt       | 26 +++++++------------
 .../PropertiesHighlightingVisitor.kt          |  4 +--
 .../TypeKindHighlightingVisitor.kt            |  2 +-
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/BeforeResolveHighlightingVisitor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/BeforeResolveHighlightingVisitor.kt
index aa55bc7ce08..af238d889bc 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/BeforeResolveHighlightingVisitor.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/BeforeResolveHighlightingVisitor.kt
@@ -75,7 +75,7 @@ internal class BeforeResolveHighlightingVisitor(private val holder: AnnotationHo
     override fun visitExpressionWithLabel(expression: KtExpressionWithLabel) {
         val targetLabel = expression.getTargetLabel()
         if (targetLabel != null) {
-            NameHighlighter.highlightName(holder, targetLabel, KotlinHighlightingColors.LABEL)
+            holder.highlightName(targetLabel, KotlinHighlightingColors.LABEL)
         }
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.kt
index 9950622d4fe..6bd33d65401 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.kt
@@ -89,7 +89,7 @@ internal class FunctionsHighlightingVisitor(holder: AnnotationHolder, bindingCon
                 holder.highlightName(callee, CONSTRUCTOR_CALL)
             }
             else if (calleeDescriptor is FunctionDescriptor) {
-                val color = when {
+                val attributesKey = when {
                     calleeDescriptor.extensionReceiverParameter != null ->
                         EXTENSION_FUNCTION_CALL
 
@@ -100,7 +100,7 @@ internal class FunctionsHighlightingVisitor(holder: AnnotationHolder, bindingCon
                         FUNCTION_CALL
                 }
 
-                holder.highlightName(callee, color)
+                holder.highlightName(callee, attributesKey)
             }
         }
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/NameHighlighter.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/NameHighlighter.kt
index aa5fb388d29..12cf8105b28 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/NameHighlighter.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/NameHighlighter.kt
@@ -25,22 +25,16 @@ import org.jetbrains.annotations.TestOnly
 object NameHighlighter {
     var namesHighlightingEnabled = true
         @TestOnly set
-
-    @JvmStatic
-    fun highlightName(holder: AnnotationHolder, psiElement: PsiElement, attributesKey: TextAttributesKey) {
-        if (namesHighlightingEnabled) {
-            holder.createInfoAnnotation(psiElement, null).textAttributes = attributesKey
-        }
-    }
-
-    @JvmStatic
-    fun highlightName(holder: AnnotationHolder, textRange: TextRange, attributesKey: TextAttributesKey) {
-        if (namesHighlightingEnabled) {
-            holder.createInfoAnnotation(textRange, null).textAttributes = attributesKey
-        }
-    }
 }
 
 fun AnnotationHolder.highlightName(element: PsiElement, attributesKey: TextAttributesKey) {
-    NameHighlighter.highlightName(this, element, attributesKey)
-}
\ No newline at end of file
+    if (NameHighlighter.namesHighlightingEnabled) {
+        createInfoAnnotation(element, null).textAttributes = attributesKey
+    }
+}
+
+fun AnnotationHolder.highlightName(textRange: TextRange, attributesKey: TextAttributesKey) {
+    if (NameHighlighter.namesHighlightingEnabled) {
+        createInfoAnnotation(textRange, null).textAttributes = attributesKey
+    }
+}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.kt
index 016c139434b..d323978a827 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.kt
@@ -72,7 +72,7 @@ internal class PropertiesHighlightingVisitor(holder: AnnotationHolder, bindingCo
             elementToHighlight: PsiElement,
             descriptor: PropertyDescriptor) {
 
-        val color = when {
+        val attributesKey = when {
             descriptor.isDynamic() ->
                 DYNAMIC_PROPERTY_CALL
 
@@ -85,6 +85,6 @@ internal class PropertiesHighlightingVisitor(holder: AnnotationHolder, bindingCo
             else ->
                 INSTANCE_PROPERTY
         }
-        holder.highlightName(elementToHighlight, color)
+        holder.highlightName(elementToHighlight, attributesKey)
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.kt
index c101d62db5a..97593bcbcc4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.kt
@@ -74,7 +74,7 @@ internal class TypeKindHighlightingVisitor(holder: AnnotationHolder, bindingCont
             }
         }
 
-        NameHighlighter.highlightName(holder, range, ANNOTATION)
+        holder.highlightName(range, ANNOTATION)
     }
 
     override fun visitTypeParameter(parameter: KtTypeParameter) {