diff --git a/idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt b/idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt
index 126ef03b06c..23b50a94186 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt
@@ -10,5 +10,5 @@ class B(): A(5) {
 }
 /*
 Text: (x: Int), Disabled: true, Strikeout: false, Green: false
-Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
+Text: (x: Int, <highlight>y: Boolean</highlight>), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt b/idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt
index d6b13f9c5be..ef365038939 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt
@@ -10,6 +10,6 @@ class B(): A(5) {
 }
 /*
 Text: (x: Int), Disabled: true, Strikeout: false, Green: false
-Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
-Text: (x: Int, y: Boolean, z: String), Disabled: false, Strikeout: false, Green: false
+Text: (x: Int, <highlight>y: Boolean</highlight>), Disabled: false, Strikeout: false, Green: true
+Text: (x: Int, <highlight>y: Boolean</highlight>, z: String), Disabled: false, Strikeout: false, Green: false
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt b/idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt
index dee6b3ab847..ea48f548cf8 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt
@@ -7,6 +7,6 @@ open class A(x: Int) {
     }
 }
 /*
-Text: ([x: Int]), Disabled: false, Strikeout: false, Green: false
-Text: ([y: Boolean = true], [x: Int], [z: Long = 12345678901234], [u: String = "abc\n"], [u0: String = "" + "123"], [uu: String = "$u"], [v: Char = '\u0000'], [vv: String = "..."]), Disabled: false, Strikeout: false, Green: true
+Text: (<highlight>[x: Int]</highlight>), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>[y: Boolean = true]</highlight>, [x: Int], [z: Long = 12345678901234], [u: String = "abc\n"], [u0: String = "" + "123"], [uu: String = "$u"], [v: Char = '\u0000'], [vv: String = "..."]), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt b/idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt
index 682fb09d4e7..bde552daa51 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt
@@ -8,5 +8,5 @@ open class A(x: Int) {
 }
 /*
 Text: ([x: Int]), Disabled: true, Strikeout: false, Green: false
-Text: ([x: Int], [y: Boolean]), Disabled: false, Strikeout: false, Green: true
+Text: ([x: Int], <highlight>[y: Boolean]</highlight>), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt b/idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt
index 28aeba1cd81..1d9c1db6bc4 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt
@@ -7,6 +7,6 @@ open class A(x: Int) {
     }
 }
 /*
-Text: ([x: Int]), Disabled: false, Strikeout: false, Green: false
-Text: ([y: Boolean], [x: Int]), Disabled: false, Strikeout: false, Green: true
+Text: (<highlight>[x: Int]</highlight>), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>[y: Boolean]</highlight>, [x: Int]), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt b/idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt
index a9f3d171fb2..bca07c182ec 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt
@@ -7,6 +7,6 @@ open class A(x: Int) {
     }
 }
 /*
-Text: (x: Int), Disabled: false, Strikeout: false, Green: false
-Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>x: Int</highlight>), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>x: Int</highlight>, y: Boolean), Disabled: false, Strikeout: false, Green: false
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt b/idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt
index 2ce1311500d..abc6a4c2cf9 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt
@@ -14,6 +14,6 @@ fun f() {
     }
 }
 /*
-Text: (x: Int), Disabled: false, Strikeout: false, Green: false
-Text: (x: Int, y: Int), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>x: Int</highlight>), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>x: Int</highlight>, y: Int), Disabled: false, Strikeout: false, Green: false
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/Println.kt b/idea/testData/parameterInfo/functionParameterInfo/Println.kt
index ae4f653f6e5..6f383cddc9c 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/Println.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/Println.kt
@@ -8,7 +8,7 @@ open class A(x: Int) {
     }
 }
 /*
-Text: (<no parameters>), Disabled: false, Strikeout: false, Green: true
-Text: (x: Boolean), Disabled: false, Strikeout: false, Green: false
-Text: (x: String), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>x: Boolean</highlight>), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>x: String</highlight>), Disabled: false, Strikeout: false, Green: false
+Text: (<no parameters>), Disabled: true, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/Simple.kt b/idea/testData/parameterInfo/functionParameterInfo/Simple.kt
index 99837866097..bff96f7c820 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/Simple.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/Simple.kt
@@ -5,4 +5,4 @@ open class A(x: Int) {
         m(<caret>1, false)
     }
 }
-//Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
+//Text: (<highlight>x: Int</highlight>, y: Boolean), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt b/idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt
index 6ecc459bf25..9f53d58657a 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt
@@ -6,4 +6,4 @@ class B(): A(5) {
         A(<caret>3)
     }
 }
-//Text: (x: Int), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
+//Text: (<highlight>x: Int</highlight>), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt b/idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt
index 194074c402a..ecc0bb88bcd 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt
@@ -6,4 +6,4 @@ class B(): A(<caret>5) {
         A(3)
     }
 }
-//Text: (x: Int), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
+//Text: (<highlight>x: Int</highlight>), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt b/idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt
index 7aa8d4ebad3..a4e1cecac44 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt
@@ -7,6 +7,6 @@ open class A(x: Int) {
     }
 }
 /*
-Text: (x: Int), Disabled: false, Strikeout: false, Green: false
-Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
+Text: (<highlight>x: Int</highlight>), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>x: Int</highlight>, y: Boolean), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt b/idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt
index e18c637d38d..3cb79ac2217 100644
--- a/idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt
+++ b/idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt
@@ -8,5 +8,5 @@ open class A(x: Int) {
 }
 /*
 Text: (x: Int), Disabled: true, Strikeout: false, Green: false
-Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
+Text: (x: Int, <highlight>y: Boolean</highlight>), Disabled: false, Strikeout: false, Green: true
 */
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java
index 9a9dd364cbd..ad9d75e9e06 100644
--- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java
@@ -106,7 +106,10 @@ public class JetFunctionParameterInfoTest extends LightCodeInsightFixtureTestCas
         MockUpdateParameterInfoContext updateContext = new MockUpdateParameterInfoContext(file, myFixture);
 
         //to update current parameter index
-        parameterInfoHandler.findElementForUpdatingParameterInfo(updateContext);
+        JetValueArgumentList elementForUpdating = parameterInfoHandler.findElementForUpdatingParameterInfo(updateContext);
+        if (elementForUpdating != null) {
+            parameterInfoHandler.updateParameterInfo(elementForUpdating, updateContext);
+        }
 
         MockParameterInfoUIContext parameterInfoUIContext =
                 new MockParameterInfoUIContext(parameterOwner, updateContext.getCurrentParameter());
diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java
index 9781ead7150..c11adf36d3a 100644
--- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java
+++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java
@@ -39,7 +39,19 @@ public class MockParameterInfoUIContext implements ParameterInfoUIContext {
     public String setupUIComponentPresentation(String text, int highlightStartOffset, int highlightEndOffset,
                                              boolean isDisabled, boolean strikeout,
                                              boolean isDisabledBeforeHighlight, Color background) {
-        String resultText = "Text: (" + text + "), " +
+        String highlightedText;
+        if (highlightStartOffset != -1 && highlightEndOffset != -1) {
+            highlightedText = text.substring(0, highlightStartOffset)
+                              + "<highlight>"
+                              + text.substring(highlightStartOffset, highlightEndOffset)
+                              + "</highlight>"
+                              + text.substring(highlightEndOffset);
+        }
+        else {
+            highlightedText = text;
+        }
+
+        String resultText = "Text: (" + highlightedText + "), " +
                             "Disabled: " + isDisabled + ", " +
                             "Strikeout: " + strikeout + ", " +
                             "Green: " + background.equals(JetFunctionParameterInfoHandler.GREEN_BACKGROUND);