From e9cefd9ece49cd6400fc4d8b591773799af8255c Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 25 May 2016 13:31:36 +0200
Subject: [PATCH] remove PARAMETER highlight on top of INSTANCE_PROPERTY for
 primary constructor parameters

---
 .../kotlin/idea/highlighter/VariablesHighlightingVisitor.kt  | 5 ++++-
 idea/testData/highlighter/SmartCast.kt                       | 2 +-
 idea/testData/highlighter/Variables.kt                       | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.kt
index 352262ae340..536abfbe1f7 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.kt
@@ -56,7 +56,10 @@ internal class VariablesHighlightingVisitor(holder: AnnotationHolder, bindingCon
     }
 
     override fun visitParameter(parameter: KtParameter) {
-        visitVariableDeclaration(parameter)
+        val propertyDescriptor = bindingContext.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, parameter)
+        if (propertyDescriptor == null) {
+            visitVariableDeclaration(parameter)
+        }
         super.visitParameter(parameter)
     }
 
diff --git a/idea/testData/highlighter/SmartCast.kt b/idea/testData/highlighter/SmartCast.kt
index a696d5ad4c2..1b4619435d3 100644
--- a/idea/testData/highlighter/SmartCast.kt
+++ b/idea/testData/highlighter/SmartCast.kt
@@ -1,4 +1,4 @@
-class <info textAttributesKey="KOTLIN_CLASS">My</info>(val <info textAttributesKey="KOTLIN_PARAMETER"><info textAttributesKey="KOTLIN_INSTANCE_PROPERTY">x</info></info>: <info textAttributesKey="KOTLIN_CLASS">Int</info>?)
+class <info textAttributesKey="KOTLIN_CLASS">My</info>(val <info textAttributesKey="KOTLIN_INSTANCE_PROPERTY">x</info>: <info textAttributesKey="KOTLIN_CLASS">Int</info>?)
 
 fun <info textAttributesKey="KOTLIN_CLASS">My</info>?.<info textAttributesKey="KOTLIN_FUNCTION_DECLARATION">foo</info>(): <info textAttributesKey="KOTLIN_CLASS">Int</info> {
     if (this == null) return 42
diff --git a/idea/testData/highlighter/Variables.kt b/idea/testData/highlighter/Variables.kt
index b106941771b..8ed2e353c3a 100644
--- a/idea/testData/highlighter/Variables.kt
+++ b/idea/testData/highlighter/Variables.kt
@@ -10,7 +10,7 @@ val <info textAttributesKey="KOTLIN_PACKAGE_PROPERTY">y</info> : <info textAttri
   return 5.<info textAttributesKey="KOTLIN_EXTENSION_PROPERTY">sq</info> + <info textAttributesKey="KOTLIN_BACKING_FIELD_VARIABLE">field</info> + <info textAttributesKey="KOTLIN_PACKAGE_PROPERTY"><info textAttributesKey="KOTLIN_MUTABLE_VARIABLE">x</info></info>
 }
 
-class <info textAttributesKey="KOTLIN_CLASS">Foo</info>(val <info textAttributesKey="KOTLIN_PARAMETER"><info textAttributesKey="KOTLIN_INSTANCE_PROPERTY">a</info></info> : <info textAttributesKey="KOTLIN_CLASS">Int</info>, <info textAttributesKey="KOTLIN_PARAMETER">b</info> : <info textAttributesKey="KOTLIN_CLASS">String</info>) {
+class <info textAttributesKey="KOTLIN_CLASS">Foo</info>(val <info textAttributesKey="KOTLIN_INSTANCE_PROPERTY">a</info> : <info textAttributesKey="KOTLIN_CLASS">Int</info>, <info textAttributesKey="KOTLIN_PARAMETER">b</info> : <info textAttributesKey="KOTLIN_CLASS">String</info>) {
   <info>init</info> {
     <info textAttributesKey="KOTLIN_PARAMETER">b</info>
   }
@@ -26,4 +26,4 @@ class <info textAttributesKey="KOTLIN_CLASS">Foo</info>(val <info textAttributes
   }
 }
 
-// NO_CHECK_WARNINGS
\ No newline at end of file
+// NO_CHECK_WARNINGS1
\ No newline at end of file