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 97a50d73454..c101d62db5a 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
@@ -19,10 +19,11 @@ package org.jetbrains.kotlin.idea.highlighter
 import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.openapi.util.TextRange
-import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingColors.*
 import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
 import org.jetbrains.kotlin.resolve.BindingContext
 
 internal class TypeKindHighlightingVisitor(holder: AnnotationHolder, bindingContext: BindingContext)
@@ -36,22 +37,25 @@ internal class TypeKindHighlightingVisitor(holder: AnnotationHolder, bindingCont
         }
 
         if (NameHighlighter.namesHighlightingEnabled) {
-            var referenceTarget: DeclarationDescriptor? = bindingContext.get(BindingContext.REFERENCE_TARGET, expression)
+            var referenceTarget = bindingContext.get(BindingContext.REFERENCE_TARGET, expression)
             if (referenceTarget is ConstructorDescriptor) {
-                referenceTarget = referenceTarget.containingDeclaration
+                val callElement = expression.getParentOfTypeAndBranch<KtCallExpression>(true) { calleeExpression }
+                    ?: expression.getParentOfTypeAndBranch<KtSuperTypeCallEntry>(true) { calleeExpression }
+                if (callElement == null) {
+                    referenceTarget = referenceTarget.containingDeclaration
+                }
             }
 
             if (referenceTarget is ClassDescriptor) {
-                val textAttributesKey = textAttributesKeyForClass(referenceTarget)
-                if (textAttributesKey === KotlinHighlightingColors.ANNOTATION) {
+                if (referenceTarget.kind == ClassKind.ANNOTATION_CLASS) {
                     highlightAnnotation(expression)
                 }
                 else {
-                    highlightName(expression, textAttributesKey)
+                    holder.highlightName(expression, textAttributesKeyForClass(referenceTarget))
                 }
             }
             else if (referenceTarget is TypeParameterDescriptor) {
-                highlightName(expression, KotlinHighlightingColors.TYPE_PARAMETER)
+                holder.highlightName(expression, TYPE_PARAMETER)
             }
         }
     }
@@ -70,14 +74,11 @@ internal class TypeKindHighlightingVisitor(holder: AnnotationHolder, bindingCont
             }
         }
 
-        NameHighlighter.highlightName(holder, range, KotlinHighlightingColors.ANNOTATION)
+        NameHighlighter.highlightName(holder, range, ANNOTATION)
     }
 
     override fun visitTypeParameter(parameter: KtTypeParameter) {
-        val identifier = parameter.nameIdentifier
-        if (identifier != null) {
-            highlightName(identifier, KotlinHighlightingColors.TYPE_PARAMETER)
-        }
+        parameter.nameIdentifier?.let { holder.highlightName(it, TYPE_PARAMETER) }
         super.visitTypeParameter(parameter)
     }
 
@@ -85,7 +86,7 @@ internal class TypeKindHighlightingVisitor(holder: AnnotationHolder, bindingCont
         val identifier = classOrObject.nameIdentifier
         val classDescriptor = bindingContext.get(BindingContext.CLASS, classOrObject)
         if (identifier != null && classDescriptor != null) {
-            highlightName(identifier, textAttributesKeyForClass(classDescriptor))
+            holder.highlightName(identifier, textAttributesKeyForClass(classDescriptor))
         }
         super.visitClassOrObject(classOrObject)
     }
@@ -94,20 +95,16 @@ internal class TypeKindHighlightingVisitor(holder: AnnotationHolder, bindingCont
         // Do nothing: 'dynamic' is highlighted as a keyword
     }
 
-    private fun highlightName(whatToHighlight: PsiElement, textAttributesKey: TextAttributesKey) {
-        NameHighlighter.highlightName(holder, whatToHighlight, textAttributesKey)
-    }
-
     private fun textAttributesKeyForClass(descriptor: ClassDescriptor): TextAttributesKey {
         when (descriptor.kind) {
-            ClassKind.INTERFACE -> return KotlinHighlightingColors.TRAIT
-            ClassKind.ANNOTATION_CLASS -> return KotlinHighlightingColors.ANNOTATION
-            ClassKind.OBJECT -> return KotlinHighlightingColors.OBJECT
-            ClassKind.ENUM_ENTRY -> return KotlinHighlightingColors.ENUM_ENTRY
+            ClassKind.INTERFACE -> return TRAIT
+            ClassKind.ANNOTATION_CLASS -> return ANNOTATION
+            ClassKind.OBJECT -> return OBJECT
+            ClassKind.ENUM_ENTRY -> return ENUM_ENTRY
             else -> return if (descriptor.modality === Modality.ABSTRACT)
-                KotlinHighlightingColors.ABSTRACT_CLASS
+                ABSTRACT_CLASS
             else
-                KotlinHighlightingColors.CLASS
+                CLASS
         }
     }
 }
diff --git a/idea/testData/highlighter/JavaTypes.kt b/idea/testData/highlighter/JavaTypes.kt
index be06d93951f..61810c1e2ad 100644
--- a/idea/testData/highlighter/JavaTypes.kt
+++ b/idea/testData/highlighter/JavaTypes.kt
@@ -1,2 +1,2 @@
-<info textAttributesKey="KOTLIN_ANNOTATION">@SuppressWarnings</info> class <info textAttributesKey="KOTLIN_CLASS">TheClass</info> : <info textAttributesKey="KOTLIN_TRAIT">Runnable</info>, <info textAttributesKey="KOTLIN_CLASS"><info textAttributesKey="KOTLIN_CONSTRUCTOR">Thread</info></info>() {
+<info textAttributesKey="KOTLIN_ANNOTATION">@SuppressWarnings</info> class <info textAttributesKey="KOTLIN_CLASS">TheClass</info> : <info textAttributesKey="KOTLIN_TRAIT">Runnable</info>, <info textAttributesKey="KOTLIN_CONSTRUCTOR">Thread</info>() {
 }
\ No newline at end of file
diff --git a/idea/testData/highlighter/Variables.kt b/idea/testData/highlighter/Variables.kt
index 8ed2e353c3a..f8e56d76ca8 100644
--- a/idea/testData/highlighter/Variables.kt
+++ b/idea/testData/highlighter/Variables.kt
@@ -26,4 +26,4 @@ class <info textAttributesKey="KOTLIN_CLASS">Foo</info>(val <info textAttributes
   }
 }
 
-// NO_CHECK_WARNINGS1
\ No newline at end of file
+// NO_CHECK_WARNINGS
\ No newline at end of file