diff --git a/idea/testData/highlighter/deprecated/Class.kt b/idea/testData/highlighter/deprecated/Class.kt
index dbdd41a3d2a..cc30ef21994 100644
--- a/idea/testData/highlighter/deprecated/Class.kt
+++ b/idea/testData/highlighter/deprecated/Class.kt
@@ -5,16 +5,16 @@ import java.util.ArrayList
 deprecated("Use A instead") open class MyClass {}
 
 fun test() {
-    val a : <warning descr="'test.MyClass' is deprecated. Use A instead">MyClass</warning>? = null
-    val b = <warning descr="'test.MyClass' is deprecated. Use A instead">MyClass</warning>()
-    val c = ArrayList<<warning descr="'test.MyClass' is deprecated. Use A instead">MyClass</warning>>()
+    val a : <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>? = null
+    val b = <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>()
+    val c = ArrayList<<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>>()
 
     a == b && a == c
 }
 
-class Test(): <warning descr="'test.MyClass' is deprecated. Use A instead">MyClass</warning>() {}
+class Test(): <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>() {}
 
-class Test2(<warning>param</warning>: <warning descr="'test.MyClass' is deprecated. Use A instead">MyClass</warning>) {}
+class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>) {}
 
 // NO_CHECK_INFOS
 // NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/ClassObject.kt b/idea/testData/highlighter/deprecated/ClassObject.kt
index 745165118c0..8dcd94a9e76 100644
--- a/idea/testData/highlighter/deprecated/ClassObject.kt
+++ b/idea/testData/highlighter/deprecated/ClassObject.kt
@@ -1,13 +1,13 @@
 fun test() {
-   <warning descr="'MyClass.Companion' is deprecated. Use A instead">MyClass</warning>.test
+   <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">MyClass</warning>.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">test</warning>
    MyClass()
    val a: MyClass? = null
    val b: MyTrait? = null
-   <warning descr="'MyTrait.Companion' is deprecated. Use A instead">MyTrait</warning>.test
-   MyTrait.<warning descr="'MyTrait.Companion' is deprecated. Use A instead">Companion</warning>
-   <warning descr="'MyTrait.Companion' is deprecated. Use A instead">MyTrait</warning>
-   MyClass.<warning descr="'MyClass.Companion' is deprecated. Use A instead">Companion</warning>
-   MyClass.<warning descr="'MyClass.Companion' is deprecated. Use A instead">Companion</warning>.test
+   <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">test</warning>
+   MyTrait.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">Companion</warning>
+   <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>
+   MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>
+   MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">test</warning>
 
    a == b
 }
diff --git a/idea/testData/highlighter/deprecated/Function.kt b/idea/testData/highlighter/deprecated/Function.kt
index 99296aba236..eadf89b877f 100644
--- a/idea/testData/highlighter/deprecated/Function.kt
+++ b/idea/testData/highlighter/deprecated/Function.kt
@@ -1,9 +1,9 @@
 fun test() {
-    <warning descr="'fun test1()' is deprecated. Use A instead">test1</warning>()
-    MyClass().<warning descr="'fun test2()' is deprecated. Use A instead">test2</warning>()
-    MyClass.<warning descr="'fun test3()' is deprecated. Use A instead">test3</warning>()
+    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test1(): Unit' is deprecated. Use A instead">test1</warning>()
+    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test2(): Unit' is deprecated. Use A instead">test2</warning>()
+    MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test3(): Unit' is deprecated. Use A instead">test3</warning>()
 
-    <warning descr="'fun test4(x: kotlin.Int, y: kotlin.Int)' is deprecated. Use A instead">test4</warning>(1, 2)
+    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test4(Int, Int): Unit' is deprecated. Use A instead">test4</warning>(1, 2)
 }
 
 deprecated("Use A instead") fun test1() { }
diff --git a/idea/testData/highlighter/deprecated/Get.kt b/idea/testData/highlighter/deprecated/Get.kt
index 34289e60e9d..f30688263c7 100644
--- a/idea/testData/highlighter/deprecated/Get.kt
+++ b/idea/testData/highlighter/deprecated/Get.kt
@@ -6,7 +6,7 @@ fun test() {
   val x1 = MyClass()
   val x2 = MyClass()
 
-  <warning descr="'fun get(i: MyClass)' is deprecated. Use A instead">x1[x2]</warning>
+  <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'get(MyClass): MyClass' is deprecated. Use A instead">x1[x2]</warning>
 }
 
 // NO_CHECK_INFOS
diff --git a/idea/testData/highlighter/deprecated/Getter.kt b/idea/testData/highlighter/deprecated/Getter.kt
index bb6cbaa0139..bd57a80852e 100644
--- a/idea/testData/highlighter/deprecated/Getter.kt
+++ b/idea/testData/highlighter/deprecated/Getter.kt
@@ -1,10 +1,10 @@
 fun test() {
     val c = MyClass()
-    c.<warning descr="'getter for test1' is deprecated. Use A instead">test1</warning>
-    c.<warning descr="'getter for test2' is deprecated. Use A instead">test2</warning>
+    c.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'getter for test1: String' is deprecated. Use A instead">test1</warning>
+    c.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'getter for test2: String' is deprecated. Use A instead">test2</warning>
     c.test2 = ""
 
-    c.<warning descr="'val test3' is deprecated. Use A instead">test3</warning>
+    c.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test3: String' is deprecated. Use A instead">test3</warning>
 }
 
 class MyClass() {
diff --git a/idea/testData/highlighter/deprecated/Inc.kt b/idea/testData/highlighter/deprecated/Inc.kt
index 90e06aabc37..fab2062ac23 100644
--- a/idea/testData/highlighter/deprecated/Inc.kt
+++ b/idea/testData/highlighter/deprecated/Inc.kt
@@ -6,7 +6,7 @@ deprecated("Use A instead") fun MyClass.inc(): MyClass { return MyClass() }
 
 fun test() {
     var x3 = MyClass()
-    x3<warning descr="'fun inc()' is deprecated. Use A instead">++</warning>
+    x3<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'inc(): MyClass' is deprecated. Use A instead">++</warning>
     x3.i
 }
 
diff --git a/idea/testData/highlighter/deprecated/Invalid.kt b/idea/testData/highlighter/deprecated/Invalid.kt
index a8c2ed95adc..743db2d3fef 100644
--- a/idea/testData/highlighter/deprecated/Invalid.kt
+++ b/idea/testData/highlighter/deprecated/Invalid.kt
@@ -3,9 +3,9 @@ fun foo() {}
 deprecated(<error>false</error>)
 fun boo() {}
 
-fun far() = <warning descr="'fun foo()' is deprecated.">foo</warning>()
+fun far() = <warning descr="[DEPRECATED_SYMBOL] 'foo(): Unit' is deprecated.">foo</warning>()
 
-fun bar() = <warning descr="'fun boo()' is deprecated.">boo</warning>()
+fun bar() = <warning descr="[DEPRECATED_SYMBOL] 'boo(): Unit' is deprecated.">boo</warning>()
 
 // NO_CHECK_INFOS
 // NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/Invoke.kt b/idea/testData/highlighter/deprecated/Invoke.kt
index 4f4222b1833..fdcf68f6f1a 100644
--- a/idea/testData/highlighter/deprecated/Invoke.kt
+++ b/idea/testData/highlighter/deprecated/Invoke.kt
@@ -5,7 +5,7 @@ deprecated("Use A instead") fun MyRunnable.invoke() {
 
 fun test() {
   val m = MyRunnable()
-  <warning descr="'fun invoke()' is deprecated. Use A instead">m()</warning>
+  <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'invoke(): Unit' is deprecated. Use A instead">m</warning>()
 }
 
 // NO_CHECK_INFOS
diff --git a/idea/testData/highlighter/deprecated/Operation.kt b/idea/testData/highlighter/deprecated/Operation.kt
index 0cff421b0ca..66641c53c52 100644
--- a/idea/testData/highlighter/deprecated/Operation.kt
+++ b/idea/testData/highlighter/deprecated/Operation.kt
@@ -19,19 +19,19 @@ fun test() {
     val x1 = MyClass()
     val x2 = MyClass()
 
-    x1 <warning descr="'fun minus(i: MyClass)' is deprecated. Use A instead">-</warning> x2
-    x1 <warning descr="'fun div(i: MyClass)' is deprecated. Use A instead">/</warning> x2
-    x1 <warning descr="'fun times(i: MyClass)' is deprecated. Use A instead">*</warning> x2
+    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'minus(MyClass): Unit' is deprecated. Use A instead">-</warning> x2
+    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'div(MyClass): Unit' is deprecated. Use A instead">/</warning> x2
+    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'times(MyClass): Unit' is deprecated. Use A instead">*</warning> x2
 
-    <warning descr="'fun not()' is deprecated. Use A instead">!</warning>x1
-    <warning descr="'fun plus()' is deprecated. Use A instead">+</warning>x1
+    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'not(): Unit' is deprecated. Use A instead">!</warning>x1
+    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'plus(): Unit' is deprecated. Use A instead">+</warning>x1
 
-    x1 <warning descr="'fun contains(i: MyClass)' is deprecated. Use A instead">in</warning> x2
-    x1 <warning descr="'fun contains(i: MyClass)' is deprecated. Use A instead">!in</warning> x2
+    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'contains(MyClass): Boolean' is deprecated. Use A instead">in</warning> x2
+    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'contains(MyClass): Boolean' is deprecated. Use A instead">!in</warning> x2
 
-    x1 <warning descr="'fun plusAssign(i: MyClass)' is deprecated. Use A instead">+=</warning> x2
+    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'plusAssign(MyClass): Unit' is deprecated. Use A instead">+=</warning> x2
 
-    x1<warning descr="'fun rangeTo(i: MyClass)' is deprecated. Use A instead">..</warning>x2
+    x1<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'rangeTo(MyClass): IntRange' is deprecated. Use A instead">..</warning>x2
 }
 
 // NO_CHECK_INFOS
diff --git a/idea/testData/highlighter/deprecated/Property.kt b/idea/testData/highlighter/deprecated/Property.kt
index ead5fadd039..6cd5ca816a5 100644
--- a/idea/testData/highlighter/deprecated/Property.kt
+++ b/idea/testData/highlighter/deprecated/Property.kt
@@ -1,11 +1,11 @@
 fun test() {
-    <warning descr="'val test1' is deprecated. Use A instead">test1</warning> == ""
-    MyClass().<warning descr="'val test2' is deprecated. Use A instead">test2</warning>
-    MyClass.<warning descr="'val test3' is deprecated. Use A instead">test3</warning>
+    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test1: String' is deprecated. Use A instead">test1</warning> == ""
+    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test2: String' is deprecated. Use A instead">test2</warning>
+    MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test3: String' is deprecated. Use A instead">test3</warning>
 
-    <warning descr="'var test4' is deprecated. Use A instead">test4</warning> == ""
-    MyClass().<warning descr="'var test5' is deprecated. Use A instead">test5</warning>
-    MyClass.<warning descr="'var test6' is deprecated. Use A instead">test6</warning>
+    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test4: String' is deprecated. Use A instead">test4</warning> == ""
+    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test5: String' is deprecated. Use A instead">test5</warning>
+    MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test6: String' is deprecated. Use A instead">test6</warning>
 }
 
 deprecated("Use A instead") val test1: String = ""
diff --git a/idea/testData/highlighter/deprecated/RangeTo.kt b/idea/testData/highlighter/deprecated/RangeTo.kt
index 073f8844576..ca9023e2e7c 100644
--- a/idea/testData/highlighter/deprecated/RangeTo.kt
+++ b/idea/testData/highlighter/deprecated/RangeTo.kt
@@ -11,7 +11,7 @@ fun test() {
     val x1 = MyClass()
     val x2 = MyClass()
 
-    for (i in x1<warning descr="'fun rangeTo(i: MyClass)' is deprecated. Use A instead">..</warning>x2) {
+    for (i in x1<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'rangeTo(MyClass): Iterable<Int>' is deprecated. Use A instead">..</warning>x2) {
 
     }
 }
diff --git a/idea/testData/highlighter/deprecated/Setter.kt b/idea/testData/highlighter/deprecated/Setter.kt
index a2216b1fc37..f1d2b2d68b0 100644
--- a/idea/testData/highlighter/deprecated/Setter.kt
+++ b/idea/testData/highlighter/deprecated/Setter.kt
@@ -1,20 +1,20 @@
 fun test() {
     MyClass().test1
-    MyClass().<warning descr="'setter for test1' is deprecated. Use A instead">test1</warning> = 0
+    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> = 0
 
-    MyClass().<warning descr="'setter for test1' is deprecated. Use A instead">test1</warning>++
-    MyClass().<warning descr="'setter for test1' is deprecated. Use A instead">test1</warning>--
+    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>++
+    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>--
 
-    ++MyClass().<warning descr="'setter for test1' is deprecated. Use A instead">test1</warning>
-    --MyClass().<warning descr="'setter for test1' is deprecated. Use A instead">test1</warning>
+    ++MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>
+    --MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>
 
-    MyClass().<warning descr="'setter for test1' is deprecated. Use A instead">test1</warning> += 1
-    MyClass().<warning descr="'setter for test1' is deprecated. Use A instead">test1</warning> -= 1
-    MyClass().<warning descr="'setter for test1' is deprecated. Use A instead">test1</warning> /= 1
-    MyClass().<warning descr="'setter for test1' is deprecated. Use A instead">test1</warning> *= 1
+    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> += 1
+    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> -= 1
+    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> /= 1
+    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> *= 1
 
     test2 + 1
-    <warning descr="'setter for test2' is deprecated. Use A instead">test2</warning> = 10
+    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test2: Int' is deprecated. Use A instead">test2</warning> = 10
 }
 
 class MyClass() {
diff --git a/idea/testData/highlighter/deprecated/Trait.kt b/idea/testData/highlighter/deprecated/Trait.kt
index 3cbacff9623..91ec7acad5c 100644
--- a/idea/testData/highlighter/deprecated/Trait.kt
+++ b/idea/testData/highlighter/deprecated/Trait.kt
@@ -1,14 +1,14 @@
 deprecated("Use A instead") trait MyTrait { }
 
 fun test() {
-   val a: <warning descr="'MyTrait' is deprecated. Use A instead">MyTrait</warning>? = null
-   val b: List<<warning descr="'MyTrait' is deprecated. Use A instead">MyTrait</warning>>? = null
+   val a: <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>? = null
+   val b: List<<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>>? = null
    a == b
 }
 
-class Test(): <warning descr="'MyTrait' is deprecated. Use A instead">MyTrait</warning> { }
+class Test(): <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning> { }
 
-class Test2(<warning>param</warning>: <warning descr="'MyTrait' is deprecated. Use A instead">MyTrait</warning>) {}
+class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>) {}
 
 // NO_CHECK_INFOS
 // NO_CHECK_WEAK_WARNINGS
\ No newline at end of file