diff --git a/idea/testData/findUsages/java/findConstructorUsages/javaConstructorInDelegationCall.results.txt b/idea/testData/findUsages/java/findConstructorUsages/javaConstructorInDelegationCall.results.txt
index 619a2a1cbad..965dba873a0 100644
--- a/idea/testData/findUsages/java/findConstructorUsages/javaConstructorInDelegationCall.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/javaConstructorInDelegationCall.results.txt
@@ -1,3 +1,3 @@
-New instance creation (12: 5) J(2)
-Supertype (7: 10) class B: J(1) {
-Unclassified usage (2: 20) constructor(): super(1) {
\ No newline at end of file
+New instance creation 12 J(2)
+Supertype 7 class B: J(1) {
+Unclassified usage 2 constructor(): super(1) {
diff --git a/idea/testData/findUsages/java/findConstructorUsages/javaDefaultConstructorInDelegationCall.results.txt b/idea/testData/findUsages/java/findConstructorUsages/javaDefaultConstructorInDelegationCall.results.txt
index 665a47ab14f..3f6c879802b 100644
--- a/idea/testData/findUsages/java/findConstructorUsages/javaDefaultConstructorInDelegationCall.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/javaDefaultConstructorInDelegationCall.results.txt
@@ -1,4 +1,4 @@
-New instance creation (16: 5) J()
-Supertype (11: 10) class B: J() {
-Unclassified usage (2: 26) constructor(i: Int): super() {
-Unclassified usage (6: 19) constructor() {
\ No newline at end of file
+New instance creation 16 J()
+Supertype 11 class B: J() {
+Unclassified usage 2 constructor(i: Int): super() {
+Unclassified usage 6 constructor() {
diff --git a/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.results.txt b/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.results.txt
index 3ce30d86ebe..4409eed5dad 100644
--- a/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.results.txt
@@ -1,6 +1,6 @@
-[primaryConstructorByJavaRef.0.java] New instance creation (12: 13) new A(1);
-[primaryConstructorByJavaRef.0.java] Unclassified usage (7: 9) super(n);
-[primaryConstructorByJavaRef.1.kt] New instance creation (13: 5) A(1)
-[primaryConstructorByJavaRef.1.kt] Supertype (9: 12) class C(): A(1)
-[primaryConstructorByJavaRef.1.kt] Unclassified usage (2: 20) constructor(): this(1)
-[primaryConstructorByJavaRef.1.kt] Unclassified usage (6: 26) constructor(n: Int): super(n)
\ No newline at end of file
+[primaryConstructorByJavaRef.0.java] New instance creation 12 new A(1);
+[primaryConstructorByJavaRef.0.java] Unclassified usage 7 super(n);
+[primaryConstructorByJavaRef.1.kt] New instance creation 13 A(1)
+[primaryConstructorByJavaRef.1.kt] Supertype 9 class C(): A(1)
+[primaryConstructorByJavaRef.1.kt] Unclassified usage 2 constructor(): this(1)
+[primaryConstructorByJavaRef.1.kt] Unclassified usage 6 constructor(n: Int): super(n)
diff --git a/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.results.txt b/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.results.txt
index 2bdabd17969..aa0a7e1e98b 100644
--- a/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.results.txt
@@ -1,6 +1,6 @@
-[primaryConstructorByJavaSuperRef.0.java] New instance creation (12: 13) new A(1);
-[primaryConstructorByJavaSuperRef.0.java] Unclassified usage (7: 9) super(n);
-[primaryConstructorByJavaSuperRef.1.kt] New instance creation (13: 5) A(1)
-[primaryConstructorByJavaSuperRef.1.kt] Supertype (9: 12) class C(): A(1)
-[primaryConstructorByJavaSuperRef.1.kt] Unclassified usage (2: 20) constructor(): this(1)
-[primaryConstructorByJavaSuperRef.1.kt] Unclassified usage (6: 26) constructor(n: Int): super(n)
\ No newline at end of file
+[primaryConstructorByJavaSuperRef.0.java] New instance creation 12 new A(1);
+[primaryConstructorByJavaSuperRef.0.java] Unclassified usage 7 super(n);
+[primaryConstructorByJavaSuperRef.1.kt] New instance creation 13 A(1)
+[primaryConstructorByJavaSuperRef.1.kt] Supertype 9 class C(): A(1)
+[primaryConstructorByJavaSuperRef.1.kt] Unclassified usage 2 constructor(): this(1)
+[primaryConstructorByJavaSuperRef.1.kt] Unclassified usage 6 constructor(n: Int): super(n)
diff --git a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.results.txt b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.results.txt
index 708badfba64..9c9606bf88f 100644
--- a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.results.txt
@@ -1,6 +1,6 @@
-[secondaryConstructorByJavaNewExpression.0.java] New instance creation (10: 13) new B("");
-[secondaryConstructorByJavaNewExpression.0.java] Unclassified usage (6: 9) super("");
-[secondaryConstructorByJavaNewExpression.1.kt] New instance creation (22: 5) B("")
-[secondaryConstructorByJavaNewExpression.1.kt] Supertype (17: 11) class C : B("") {
-[secondaryConstructorByJavaNewExpression.1.kt] Unclassified usage (12: 27) constructor(a: Int) : super("") {
-[secondaryConstructorByJavaNewExpression.1.kt] Unclassified usage (2: 20) constructor(): this("") {
\ No newline at end of file
+[secondaryConstructorByJavaNewExpression.0.java] New instance creation 10 new B("");
+[secondaryConstructorByJavaNewExpression.0.java] Unclassified usage 6 super("");
+[secondaryConstructorByJavaNewExpression.1.kt] New instance creation 22 B("")
+[secondaryConstructorByJavaNewExpression.1.kt] Supertype 17 class C : B("") {
+[secondaryConstructorByJavaNewExpression.1.kt] Unclassified usage 12 constructor(a: Int) : super("") {
+[secondaryConstructorByJavaNewExpression.1.kt] Unclassified usage 2 constructor(): this("") {
diff --git a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.results.txt b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.results.txt
index 20002d57d0e..cd0744ffcde 100644
--- a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.results.txt
@@ -1,6 +1,6 @@
-[secondaryConstructorByJavaSuperCall.0.java] New instance creation (10: 13) new B("");
-[secondaryConstructorByJavaSuperCall.0.java] Unclassified usage (6: 9) super("");
-[secondaryConstructorByJavaSuperCall.1.kt] New instance creation (22: 5) B("")
-[secondaryConstructorByJavaSuperCall.1.kt] Supertype (17: 11) class C : B("") {
-[secondaryConstructorByJavaSuperCall.1.kt] Unclassified usage (12: 27) constructor(a: Int) : super("") {
-[secondaryConstructorByJavaSuperCall.1.kt] Unclassified usage (2: 20) constructor(): this("") {
\ No newline at end of file
+[secondaryConstructorByJavaSuperCall.0.java] New instance creation 10 new B("");
+[secondaryConstructorByJavaSuperCall.0.java] Unclassified usage 6 super("");
+[secondaryConstructorByJavaSuperCall.1.kt] New instance creation 22 B("")
+[secondaryConstructorByJavaSuperCall.1.kt] Supertype 17 class C : B("") {
+[secondaryConstructorByJavaSuperCall.1.kt] Unclassified usage 12 constructor(a: Int) : super("") {
+[secondaryConstructorByJavaSuperCall.1.kt] Unclassified usage 2 constructor(): this("") {
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt
index 998d39e24d3..2cfc9915203 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt
@@ -1,18 +1,18 @@
-Class/object property type (2: 15) var next: A? = A()
-Function return types (15: 20) fun getNext(): A? {
-Function return types (36: 16) fun Any.toA(): A? {
-Local variable declaration (11: 17) val aa: A = a
-Nested class/object (1: 31) public class X(bar: String? = A.BAR): A() {
-Nested class/object (3: 26) val myBar: String? = A.BAR
-Nested class/object (6: 9) A.BAR = ""
-Nested class/object (7: 9) A.foos()
-New instance creation (2: 20) var next: A? = A()
-New instance creation (32: 18) fun X.bar(a: A = A()) {
-Parameter type (10: 16) fun foo(a: A) {
-Parameter type (32: 14) fun X.bar(a: A = A()) {
-Super type qualifier (20: 15) super<A>.foo()
-Supertype (1: 39) public class X(bar: String? = A.BAR): A() {
-Supertype (23: 23) companion object: A() {
-Supertype (28: 11) object O: A() {
-Target type of 'is' operation (37: 24) return if (this is A) this as A else null
-Usage in cast target type (37: 35) return if (this is A) this as A else null
+Class/object property type 2 var next: A? = A()
+Function return types 15 fun getNext(): A? {
+Function return types 36 fun Any.toA(): A? {
+Local variable declaration 11 val aa: A = a
+Nested class/object 1 public class X(bar: String? = A.BAR): A() {
+Nested class/object 3 val myBar: String? = A.BAR
+Nested class/object 6 A.BAR = ""
+Nested class/object 7 A.foos()
+New instance creation 2 var next: A? = A()
+New instance creation 32 fun X.bar(a: A = A()) {
+Parameter type 10 fun foo(a: A) {
+Parameter type 32 fun X.bar(a: A = A()) {
+Super type qualifier 20 super<A>.foo()
+Supertype 1 public class X(bar: String? = A.BAR): A() {
+Supertype 23 companion object: A() {
+Supertype 28 object O: A() {
+Target type of 'is' operation 37 return if (this is A) this as A else null
+Usage in cast target type 37 return if (this is A) this as A else null
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.results.txt
index 2b9e026c1e5..ae2397c9836 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (2: 22) public interface T: A
-Unclassified usage (4: 13) val a = object: A() {}
-Unclassified usage (7: 17) val b = object: T {}
+Unclassified usage 2 public interface T: A
+Unclassified usage 4 val a = object: A() {}
+Unclassified usage 7 val b = object: T {}
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
index 2e3cceba574..f635d82d5af 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage (1: 19) public open class X: A()
-Unclassified usage (3: 18) public interface T: A
-Unclassified usage (5: 19) public open class Y: X()
-Unclassified usage (7: 14) public class Z: Y(), T
\ No newline at end of file
+Unclassified usage 1 public open class X: A()
+Unclassified usage 3 public interface T: A
+Unclassified usage 5 public open class Y: X()
+Unclassified usage 7 public class Z: Y(), T
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt
index 80894b874eb..93635d50470 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage (2: 23) public open class X: A()
-Unclassified usage (4: 22) public interface T: A
-Unclassified usage (7: 27) public open class Y: X()
-Unclassified usage (9: 22) public class Z: Y(), T
\ No newline at end of file
+Unclassified usage 2 public open class X: A()
+Unclassified usage 4 public interface T: A
+Unclassified usage 7 public open class Y: X()
+Unclassified usage 9 public class Z: Y(), T
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.results.txt
index d4f5c49bdab..c1c1ca1af8e 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (2: 22) public interface T: A
-Unclassified usage (4: 19) public object O1: A()
-Unclassified usage (7: 23) public object O2: T
+Unclassified usage 2 public interface T: A
+Unclassified usage 4 public object O1: A()
+Unclassified usage 7 public object O2: T
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt
index 80894b874eb..93635d50470 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage (2: 23) public open class X: A()
-Unclassified usage (4: 22) public interface T: A
-Unclassified usage (7: 27) public open class Y: X()
-Unclassified usage (9: 22) public class Z: Y(), T
\ No newline at end of file
+Unclassified usage 2 public open class X: A()
+Unclassified usage 4 public interface T: A
+Unclassified usage 7 public open class Y: X()
+Unclassified usage 9 public class Z: Y(), T
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.results.txt
index 6de4df280eb..c1c1ca1af8e 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (2: 22) public interface T: A
-Unclassified usage (4: 19) public object O1: A()
-Unclassified usage (7: 23) public object O2: T
\ No newline at end of file
+Unclassified usage 2 public interface T: A
+Unclassified usage 4 public object O1: A()
+Unclassified usage 7 public object O2: T
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.results.txt
index a78529186ce..883a643916e 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (1: 18) public interface T: A
-Unclassified usage (3: 15) public object O1: A()
-Unclassified usage (5: 15) public object O2: T
+Unclassified usage 1 public interface T: A
+Unclassified usage 3 public object O1: A()
+Unclassified usage 5 public object O2: T
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.results.txt
index c242079ec27..e1a8c870435 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.results.txt
@@ -1,4 +1,4 @@
-Value read (1: 33) public class X(bar: String? = A.BAR): A() {
-Value read (3: 28) val myBar: String? = A.BAR
-Value write (12: 12) aa.bar = ""
-Value write (6: 11) A.BAR = ""
+Value read 1 public class X(bar: String? = A.BAR): A() {
+Value read 3 val myBar: String? = A.BAR
+Value write 12 aa.bar = ""
+Value write 6 A.BAR = ""
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt
index ebc29f929ce..3c5b3a2a450 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt
@@ -1,7 +1,7 @@
-Function call (20: 18) super<A>.foo()
-Function call (7: 11) A.foos()
-New instance creation (2: 20) var next: A? = A()
-New instance creation (32: 18) fun X.bar(a: A = A()) {
-Supertype (1: 39) public class X(bar: String? = A.BAR): A() {
-Supertype (23: 23) companion object: A() {
-Supertype (28: 11) object O: A() {
+Function call 20 super<A>.foo()
+Function call 7 A.foos()
+New instance creation 2 var next: A? = A()
+New instance creation 32 fun X.bar(a: A = A()) {
+Supertype 1 public class X(bar: String? = A.BAR): A() {
+Supertype 23 companion object: A() {
+Supertype 28 object O: A() {
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt
index 998d39e24d3..2cfc9915203 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt
@@ -1,18 +1,18 @@
-Class/object property type (2: 15) var next: A? = A()
-Function return types (15: 20) fun getNext(): A? {
-Function return types (36: 16) fun Any.toA(): A? {
-Local variable declaration (11: 17) val aa: A = a
-Nested class/object (1: 31) public class X(bar: String? = A.BAR): A() {
-Nested class/object (3: 26) val myBar: String? = A.BAR
-Nested class/object (6: 9) A.BAR = ""
-Nested class/object (7: 9) A.foos()
-New instance creation (2: 20) var next: A? = A()
-New instance creation (32: 18) fun X.bar(a: A = A()) {
-Parameter type (10: 16) fun foo(a: A) {
-Parameter type (32: 14) fun X.bar(a: A = A()) {
-Super type qualifier (20: 15) super<A>.foo()
-Supertype (1: 39) public class X(bar: String? = A.BAR): A() {
-Supertype (23: 23) companion object: A() {
-Supertype (28: 11) object O: A() {
-Target type of 'is' operation (37: 24) return if (this is A) this as A else null
-Usage in cast target type (37: 35) return if (this is A) this as A else null
+Class/object property type 2 var next: A? = A()
+Function return types 15 fun getNext(): A? {
+Function return types 36 fun Any.toA(): A? {
+Local variable declaration 11 val aa: A = a
+Nested class/object 1 public class X(bar: String? = A.BAR): A() {
+Nested class/object 3 val myBar: String? = A.BAR
+Nested class/object 6 A.BAR = ""
+Nested class/object 7 A.foos()
+New instance creation 2 var next: A? = A()
+New instance creation 32 fun X.bar(a: A = A()) {
+Parameter type 10 fun foo(a: A) {
+Parameter type 32 fun X.bar(a: A = A()) {
+Super type qualifier 20 super<A>.foo()
+Supertype 1 public class X(bar: String? = A.BAR): A() {
+Supertype 23 companion object: A() {
+Supertype 28 object O: A() {
+Target type of 'is' operation 37 return if (this is A) this as A else null
+Usage in cast target type 37 return if (this is A) this as A else null
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.results.txt
index 3dc3b840f90..b54823da36b 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.results.txt
@@ -1 +1 @@
-Unclassified usage (3: 18) public interface T: A
+Unclassified usage 3 public interface T: A
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.results.txt
index d550fefa893..022ea4691e9 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.results.txt
@@ -1,15 +1,15 @@
-Class/object property type (3: 25) var next: Outer.A? = (this@KOuter as Outer).A()
-Function return types (15: 30) fun getNext(): Outer.A? {
-Function return types (29: 22) fun Any.toA(): Outer.A? {
-Local variable declaration (11: 27) val aa: Outer.A = a
-New instance creation (25: 39) fun KOuter.X.bar(a: Outer.A = Outer().A()) {
-New instance creation (2: 64) public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
-New instance creation (3: 53) var next: Outer.A? = (this@KOuter as Outer).A()
-New instance creation (4: 53) val myBar: String? = (this@KOuter as Outer).A().bar
-New instance creation (7: 36) (this@KOuter as Outer).A().bar = ""
-Parameter type (10: 26) fun foo(a: Outer.A) {
-Parameter type (25: 27) fun KOuter.X.bar(a: Outer.A = Outer().A()) {
-Super type qualifier (20: 25) super<Outer.A>.foo()
-Supertype (2: 80) public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
-Target type of 'is' operation (30: 30) return if (this is Outer.A) this as Outer.A else null
-Usage in cast target type (30: 47) return if (this is Outer.A) this as Outer.A else null
+Class/object property type 3 var next: Outer.A? = (this@KOuter as Outer).A()
+Function return types 15 fun getNext(): Outer.A? {
+Function return types 29 fun Any.toA(): Outer.A? {
+Local variable declaration 11 val aa: Outer.A = a
+New instance creation 2 public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
+New instance creation 25 fun KOuter.X.bar(a: Outer.A = Outer().A()) {
+New instance creation 3 var next: Outer.A? = (this@KOuter as Outer).A()
+New instance creation 4 val myBar: String? = (this@KOuter as Outer).A().bar
+New instance creation 7 (this@KOuter as Outer).A().bar = ""
+Parameter type 10 fun foo(a: Outer.A) {
+Parameter type 25 fun KOuter.X.bar(a: Outer.A = Outer().A()) {
+Super type qualifier 20 super<Outer.A>.foo()
+Supertype 2 public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
+Target type of 'is' operation 30 return if (this is Outer.A) this as Outer.A else null
+Usage in cast target type 30 return if (this is Outer.A) this as Outer.A else null
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.results.txt
index df305813726..311db3ea285 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (2: 16) open class X: A
-Unclassified usage (4: 13) val a = object: A
-Unclassified usage (7: 17) val b = object: X()
+Unclassified usage 2 open class X: A
+Unclassified usage 4 val a = object: A
+Unclassified usage 7 val b = object: X()
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
index d425b40ce69..c03dd1515b5 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (1: 19) public open class X: A
-Unclassified usage (5: 19) public open class Y: X()
-Unclassified usage (7: 14) public class Z: Y(), T
\ No newline at end of file
+Unclassified usage 1 public open class X: A
+Unclassified usage 5 public open class Y: X()
+Unclassified usage 7 public class Z: Y(), T
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt
index f2abff9989c..c28c7ab9c93 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (2: 23) public open class X: A
-Unclassified usage (7: 27) public open class Y: X()
-Unclassified usage (9: 22) public class Z: Y(), T
\ No newline at end of file
+Unclassified usage 2 public open class X: A
+Unclassified usage 7 public open class Y: X()
+Unclassified usage 9 public class Z: Y(), T
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.results.txt
index 328c9aceee2..412be8adb45 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (2: 23) public open class T: A
-Unclassified usage (4: 19) public object O1: A()
-Unclassified usage (7: 23) public object O2: T()
+Unclassified usage 2 public open class T: A
+Unclassified usage 4 public object O1: A()
+Unclassified usage 7 public object O2: T()
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.results.txt
index d6115fb9110..2c025ef46f0 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (2: 16) open class X: A
-Unclassified usage (7: 27) public open class Y: X()
-Unclassified usage (9: 22) public class Z: T
+Unclassified usage 2 open class X: A
+Unclassified usage 7 public open class Y: X()
+Unclassified usage 9 public class Z: T
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.results.txt
index e59b0efa22a..08168df0f24 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (2: 16) open class T: A
-Unclassified usage (4: 12) object O1: A
-Unclassified usage (7: 16) object O2: T()
+Unclassified usage 2 open class T: A
+Unclassified usage 4 object O1: A
+Unclassified usage 7 object O2: T()
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.results.txt
index de9b8cac3b0..00a95056087 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (4: 15) interface T: A
-Unclassified usage (7: 26) public interface Y: X
\ No newline at end of file
+Unclassified usage 4 interface T: A
+Unclassified usage 7 public interface Y: X
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.results.txt
index 9417b497675..86dcdff14be 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (1: 19) public open class T: A
-Unclassified usage (3: 15) public object O1: A()
-Unclassified usage (5: 15) public object O2: T()
+Unclassified usage 1 public open class T: A
+Unclassified usage 3 public object O1: A()
+Unclassified usage 5 public object O2: T()
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt
index 93d78b5dad9..9a5372fd768 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt
@@ -1,18 +1,18 @@
-Class/object property type (2: 21) var next: Outer.A? = Outer.A()
-Function return types (15: 26) fun getNext(): Outer.A? {
-Function return types (36: 22) fun Any.toA(): Outer.A? {
-Local variable declaration (11: 23) val aa: Outer.A = a
-Nested class/object (1: 37) public class X(bar: String? = Outer.A.BAR): Outer.A() {
-Nested class/object (3: 32) val myBar: String? = Outer.A.BAR
-Nested class/object (6: 15) Outer.A.BAR = ""
-Nested class/object (7: 15) Outer.A.foos()
-New instance creation (2: 32) var next: Outer.A? = Outer.A()
-New instance creation (32: 30) fun X.bar(a: Outer.A = Outer.A()) {
-Parameter type (10: 22) fun foo(a: Outer.A) {
-Parameter type (32: 20) fun X.bar(a: Outer.A = Outer.A()) {
-Super type qualifier (20: 21) super<Outer.A>.foo()
-Supertype (1: 51) public class X(bar: String? = Outer.A.BAR): Outer.A() {
-Supertype (23: 29) companion object: Outer.A() {
-Supertype (28: 17) object O: Outer.A() {
-Target type of 'is' operation (37: 30) return if (this is Outer.A) this as Outer.A else null
-Usage in cast target type (37: 47) return if (this is Outer.A) this as Outer.A else null
+Class/object property type 2 var next: Outer.A? = Outer.A()
+Function return types 15 fun getNext(): Outer.A? {
+Function return types 36 fun Any.toA(): Outer.A? {
+Local variable declaration 11 val aa: Outer.A = a
+Nested class/object 1 public class X(bar: String? = Outer.A.BAR): Outer.A() {
+Nested class/object 3 val myBar: String? = Outer.A.BAR
+Nested class/object 6 Outer.A.BAR = ""
+Nested class/object 7 Outer.A.foos()
+New instance creation 2 var next: Outer.A? = Outer.A()
+New instance creation 32 fun X.bar(a: Outer.A = Outer.A()) {
+Parameter type 10 fun foo(a: Outer.A) {
+Parameter type 32 fun X.bar(a: Outer.A = Outer.A()) {
+Super type qualifier 20 super<Outer.A>.foo()
+Supertype 1 public class X(bar: String? = Outer.A.BAR): Outer.A() {
+Supertype 23 companion object: Outer.A() {
+Supertype 28 object O: Outer.A() {
+Target type of 'is' operation 37 return if (this is Outer.A) this as Outer.A else null
+Usage in cast target type 37 return if (this is Outer.A) this as Outer.A else null
diff --git a/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.results.txt b/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.results.txt
index 561ae25c2aa..9d4ebe41f63 100644
--- a/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.results.txt
@@ -1,2 +1,2 @@
-Value read (4: 15) println(a.foo)
-Value write (3: 7) a.foo = "bar"
+Value read 4 println(a.foo)
+Value write 3 a.foo = "bar"
diff --git a/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.results.txt b/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.results.txt
index 0e4831aa8cf..e178f75e6ec 100644
--- a/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.results.txt
+++ b/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.results.txt
@@ -1,4 +1,4 @@
-[JKMethodOverrides.0.java] Unclassified usage (11: 17) public void foo() {
-[JKMethodOverrides.1.kt] Unclassified usage (14: 25) public override fun foo() {
-[JKMethodOverrides.1.kt] Unclassified usage (2: 25) public override fun foo() {
-[JKMethodOverrides.1.kt] Unclassified usage (8: 25) public override fun foo() {
\ No newline at end of file
+[JKMethodOverrides.0.java] Unclassified usage 11 public void foo() {
+[JKMethodOverrides.1.kt] Unclassified usage 14 public override fun foo() {
+[JKMethodOverrides.1.kt] Unclassified usage 2 public override fun foo() {
+[JKMethodOverrides.1.kt] Unclassified usage 8 public override fun foo() {
diff --git a/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.results.txt b/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.results.txt
index 92a82ad1516..0f57204ffbd 100644
--- a/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.results.txt
@@ -1,4 +1,4 @@
-Callable reference (5: 16) val a = A::foo
-Callable reference (6: 16) val b = B::foo
-Function call (2: 9) A().foo()
-Function call (3: 9) B().foo()
+Callable reference 5 val a = A::foo
+Callable reference 6 val b = B::foo
+Function call 2 A().foo()
+Function call 3 B().foo()
diff --git a/idea/testData/findUsages/java/findJavaMethodUsages/SyntheticProperties.results.txt b/idea/testData/findUsages/java/findJavaMethodUsages/SyntheticProperties.results.txt
index 759e44517df..0288f98e109 100644
--- a/idea/testData/findUsages/java/findJavaMethodUsages/SyntheticProperties.results.txt
+++ b/idea/testData/findUsages/java/findJavaMethodUsages/SyntheticProperties.results.txt
@@ -1,2 +1,2 @@
-Value read (2: 21) print(javaClass.something)
-Value write (4: 15) javaClass.something++
\ No newline at end of file
+Value read 2 print(javaClass.something)
+Value write 4 javaClass.something++
diff --git a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.results.txt b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.results.txt
index 83057d8634b..036097dccbc 100644
--- a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.results.txt
+++ b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.results.txt
@@ -1,4 +1,4 @@
-[javaPropertyGetterUsagesKJ.0.java] Unclassified usage (23: 17) new J().getP();
-[javaPropertyGetterUsagesKJ.0.java] Unclassified usage (26: 17) new B().getP();
-[javaPropertyGetterUsagesKJ.1.kt] Value read (20: 17) val t = J().p
-[javaPropertyGetterUsagesKJ.1.kt] Value read (23: 17) val t = B().p
\ No newline at end of file
+[javaPropertyGetterUsagesKJ.0.java] Unclassified usage 23 new J().getP();
+[javaPropertyGetterUsagesKJ.0.java] Unclassified usage 26 new B().getP();
+[javaPropertyGetterUsagesKJ.1.kt] Value read 20 val t = J().p
+[javaPropertyGetterUsagesKJ.1.kt] Value read 23 val t = B().p
diff --git a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.results.txt b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.results.txt
index 7452d91a249..8771af09536 100644
--- a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.results.txt
+++ b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.results.txt
@@ -1,4 +1,4 @@
-[javaPropertySetterUsagesKJ.0.java] Unclassified usage (24: 17) new J().setP(1);
-[javaPropertySetterUsagesKJ.0.java] Unclassified usage (27: 17) new B().setP(1);
-[javaPropertySetterUsagesKJ.1.kt] Value write (21: 9) J().p = 1
-[javaPropertySetterUsagesKJ.1.kt] Value write (24: 9) B().p = 1
\ No newline at end of file
+[javaPropertySetterUsagesKJ.0.java] Unclassified usage 24 new J().setP(1);
+[javaPropertySetterUsagesKJ.0.java] Unclassified usage 27 new B().setP(1);
+[javaPropertySetterUsagesKJ.1.kt] Value write 21 J().p = 1
+[javaPropertySetterUsagesKJ.1.kt] Value write 24 B().p = 1
diff --git a/idea/testData/findUsages/kotlin/companionObject/inContainingClass.results.txt b/idea/testData/findUsages/kotlin/companionObject/inContainingClass.results.txt
index c87b2dcf188..57779504d40 100644
--- a/idea/testData/findUsages/kotlin/companionObject/inContainingClass.results.txt
+++ b/idea/testData/findUsages/kotlin/companionObject/inContainingClass.results.txt
@@ -1,4 +1,4 @@
-Function call (10: 9) ext() // companion object is extension receiver
-Function call (5: 9) foo()
-Implicit 'get' (8: 9) 1[2] // using companion object function by convention
-Value read (6: 9) v
\ No newline at end of file
+Function call 10 ext() // companion object is extension receiver
+Function call 5 foo()
+Implicit 'get' 8 1[2] // using companion object function by convention
+Value read 6 v
diff --git a/idea/testData/findUsages/kotlin/companionObject/javaUsage.results.txt b/idea/testData/findUsages/kotlin/companionObject/javaUsage.results.txt
index 79dabc16ce4..254b86fa629 100644
--- a/idea/testData/findUsages/kotlin/companionObject/javaUsage.results.txt
+++ b/idea/testData/findUsages/kotlin/companionObject/javaUsage.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (5: 32) System.out.println(Foo.CONST);
-Unclassified usage (6: 13) Foo.s();
-Unclassified usage (7: 13) Foo.Companion.f();
\ No newline at end of file
+Unclassified usage 5 System.out.println(Foo.CONST);
+Unclassified usage 6 Foo.s();
+Unclassified usage 7 Foo.Companion.f();
diff --git a/idea/testData/findUsages/kotlin/companionObject/named.results.txt b/idea/testData/findUsages/kotlin/companionObject/named.results.txt
index 67183b61be0..5ca3f3e024a 100644
--- a/idea/testData/findUsages/kotlin/companionObject/named.results.txt
+++ b/idea/testData/findUsages/kotlin/companionObject/named.results.txt
@@ -1,4 +1,4 @@
-Companion object (5: 5) Foo.f()
-Companion object (6: 13) val x = Foo
-Companion object (8: 9) Foo.Bar.f()
-Companion object (9: 18) val xx = Foo.Bar
\ No newline at end of file
+Companion object 5 Foo.f()
+Companion object 6 val x = Foo
+Companion object 8 Foo.Bar.f()
+Companion object 9 val xx = Foo.Bar
diff --git a/idea/testData/findUsages/kotlin/companionObject/simple.results.txt b/idea/testData/findUsages/kotlin/companionObject/simple.results.txt
index 86cefd39e25..33fae9a4cac 100644
--- a/idea/testData/findUsages/kotlin/companionObject/simple.results.txt
+++ b/idea/testData/findUsages/kotlin/companionObject/simple.results.txt
@@ -1,4 +1,4 @@
-Companion object (5: 5) Foo.f()
-Companion object (6: 13) val x = Foo
-Companion object (8: 9) Foo.Companion.f()
-Companion object (9: 18) val xx = Foo.Companion
\ No newline at end of file
+Companion object 5 Foo.f()
+Companion object 6 val x = Foo
+Companion object 8 Foo.Companion.f()
+Companion object 9 val xx = Foo.Companion
diff --git a/idea/testData/findUsages/kotlin/conventions/compareTo.results.txt b/idea/testData/findUsages/kotlin/conventions/compareTo.results.txt
index ac010259dec..56bc298898a 100644
--- a/idea/testData/findUsages/kotlin/conventions/compareTo.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/compareTo.results.txt
@@ -1,5 +1,5 @@
-Function call (10: 10) A(0) compareTo A(1)
-Function call (11: 10) A(0) < A(1)
-Function call (12: 10) A(0) <= A(1)
-Function call (13: 10) A(0) > A(1)
-Function call (14: 10) A(0) >= A(1)
+Function call 10 A(0) compareTo A(1)
+Function call 11 A(0) < A(1)
+Function call 12 A(0) <= A(1)
+Function call 13 A(0) > A(1)
+Function call 14 A(0) >= A(1)
diff --git a/idea/testData/findUsages/kotlin/conventions/componentFunctions.results.txt b/idea/testData/findUsages/kotlin/conventions/componentFunctions.results.txt
index 21778982c9f..166e20e2b55 100644
--- a/idea/testData/findUsages/kotlin/conventions/componentFunctions.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/componentFunctions.results.txt
@@ -1,4 +1,4 @@
-[componentFunctions.0.kt] Function call (9: 7) a.component1()
-[componentFunctions.0.kt] Value read (10: 9) val (x, y, z) = a
-[componentFunctions.0.kt] Value read (8: 7) a.n
-[componentFunctions.1.kt] Value read (2: 10) for ((x, y, z) in arrayOf<A>()) {
\ No newline at end of file
+[componentFunctions.0.kt] Function call 9 a.component1()
+[componentFunctions.0.kt] Value read 10 val (x, y, z) = a
+[componentFunctions.0.kt] Value read 8 a.n
+[componentFunctions.1.kt] Value read 2 for ((x, y, z) in arrayOf<A>()) {
diff --git a/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.results.txt b/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.results.txt
index 0978371c897..ea35cc53b84 100644
--- a/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.results.txt
@@ -1,3 +1,3 @@
-Function call (10: 7) a.component1()
-Value read (11: 9) val (x, y, z) = a
-Value read (9: 7) a.n
\ No newline at end of file
+Function call 10 a.component1()
+Value read 11 val (x, y, z) = a
+Value read 9 a.n
diff --git a/idea/testData/findUsages/kotlin/conventions/contains.results.txt b/idea/testData/findUsages/kotlin/conventions/contains.results.txt
index db3fe43d2fe..b542b0e80f2 100644
--- a/idea/testData/findUsages/kotlin/conventions/contains.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/contains.results.txt
@@ -1,5 +1,5 @@
-Function call (10: 7) 1 in A(2)
-Function call (11: 7) 1 !in A(2)
-Function call (13: 9) in A(2) -> {}
-Function call (14: 9) !in A(2) -> {}
-Function call (9: 10) A(2) contains 1
+Function call 10 1 in A(2)
+Function call 11 1 !in A(2)
+Function call 13 in A(2) -> {}
+Function call 14 !in A(2) -> {}
+Function call 9 A(2) contains 1
diff --git a/idea/testData/findUsages/kotlin/conventions/equals.results.txt b/idea/testData/findUsages/kotlin/conventions/equals.results.txt
index 96c0ce365d3..0ddf42e4a1f 100644
--- a/idea/testData/findUsages/kotlin/conventions/equals.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/equals.results.txt
@@ -1,4 +1,4 @@
-Function call (10: 10) A(0) == A(1)
-Function call (11: 10) A(0) != A(1)
-Function call (12: 10) A(0) equals A(1)
-Function call (6: 71) override fun equals(other: Any?): Boolean = other is A && other.n == n
\ No newline at end of file
+Function call 10 A(0) == A(1)
+Function call 11 A(0) != A(1)
+Function call 12 A(0) equals A(1)
+Function call 6 override fun equals(other: Any?): Boolean = other is A && other.n == n
diff --git a/idea/testData/findUsages/kotlin/conventions/forIteration.results.txt b/idea/testData/findUsages/kotlin/conventions/forIteration.results.txt
index c4d3ec3a0c3..5ae6e4c71e5 100644
--- a/idea/testData/findUsages/kotlin/conventions/forIteration.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/forIteration.results.txt
@@ -1,2 +1,2 @@
-Implicit iteration (13: 12) for (a in A<String>()) {}
-Implicit iteration (15: 12) for (a in A<Int>()) {}
+Implicit iteration 13 for (a in A<String>()) {}
+Implicit iteration 15 for (a in A<Int>()) {}
diff --git a/idea/testData/findUsages/kotlin/conventions/get.results.txt b/idea/testData/findUsages/kotlin/conventions/get.results.txt
index 8304ef1f3ec..f7ef5548901 100644
--- a/idea/testData/findUsages/kotlin/conventions/get.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/get.results.txt
@@ -1,2 +1,2 @@
-Function call (9: 10) B(1).get(2)
-Implicit 'get' (10: 5) B(1)[2]
\ No newline at end of file
+Function call 9 B(1).get(2)
+Implicit 'get' 10 B(1)[2]
diff --git a/idea/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.results.txt b/idea/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.results.txt
index 1abd0f48279..ec196affe9a 100644
--- a/idea/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.results.txt
@@ -1 +1 @@
-Property delegation (10: 15) val p: String by Delegate()
\ No newline at end of file
+Property delegation 10 val p: String by Delegate()
diff --git a/idea/testData/findUsages/kotlin/conventions/inc.results.txt b/idea/testData/findUsages/kotlin/conventions/inc.results.txt
index 34be7f422a0..294ca938ec3 100644
--- a/idea/testData/findUsages/kotlin/conventions/inc.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/inc.results.txt
@@ -1,3 +1,3 @@
-Function call (10: 7) a.inc()
-Function call (11: 5) ++a
-Function call (12: 6) a++
+Function call 10 a.inc()
+Function call 11 ++a
+Function call 12 a++
diff --git a/idea/testData/findUsages/kotlin/conventions/invoke.results.txt b/idea/testData/findUsages/kotlin/conventions/invoke.results.txt
index 379e82d870f..cae68d38fe6 100644
--- a/idea/testData/findUsages/kotlin/conventions/invoke.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/invoke.results.txt
@@ -1 +1 @@
-Function call (9: 10) B(1).invoke(2)
+Function call 9 B(1).invoke(2)
diff --git a/idea/testData/findUsages/kotlin/conventions/plus.results.txt b/idea/testData/findUsages/kotlin/conventions/plus.results.txt
index aae3a5f5dab..0dd61ab69c0 100644
--- a/idea/testData/findUsages/kotlin/conventions/plus.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/plus.results.txt
@@ -1,6 +1,6 @@
-Function call (10: 17) A(0) + A(1) + 2
-Function call (11: 20) A(0) plus A(1) plus 2
-Function call (12: 20) A(0).plus(A(1).plus(2))
-Function call (15: 7) a += 1
-Function call (6: 30) fun plus(a: A): A = this + a.n
-Unclassified usage (18: 5) +A(0)
\ No newline at end of file
+Function call 10 A(0) + A(1) + 2
+Function call 11 A(0) plus A(1) plus 2
+Function call 12 A(0).plus(A(1).plus(2))
+Function call 15 a += 1
+Function call 6 fun plus(a: A): A = this + a.n
+Unclassified usage 18 +A(0)
diff --git a/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt b/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt
index 1a1195222cd..97482ce97b9 100644
--- a/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt
@@ -1,3 +1,3 @@
-Function call (10: 14) this += a.n
-Function call (16: 7) a.plusAssign(1)
-Function call (17: 7) a += 1
\ No newline at end of file
+Function call 10 this += a.n
+Function call 16 a.plusAssign(1)
+Function call 17 a += 1
diff --git a/idea/testData/findUsages/kotlin/conventions/propertyDelegatedFunction.results.txt b/idea/testData/findUsages/kotlin/conventions/propertyDelegatedFunction.results.txt
index 51dd8b64207..95ef811697f 100644
--- a/idea/testData/findUsages/kotlin/conventions/propertyDelegatedFunction.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/propertyDelegatedFunction.results.txt
@@ -1 +1 @@
-Property delegation (15: 15) var p: String by Delegate()
\ No newline at end of file
+Property delegation 15 var p: String by Delegate()
diff --git a/idea/testData/findUsages/kotlin/conventions/set.results.txt b/idea/testData/findUsages/kotlin/conventions/set.results.txt
index 8b4ed0b9e49..0b6310b3e67 100644
--- a/idea/testData/findUsages/kotlin/conventions/set.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/set.results.txt
@@ -1,2 +1,2 @@
-Function call (10: 7) a.set(2, B(2))
-Implicit 'set' (11: 5) a[2] = B(2)
+Function call 10 a.set(2, B(2))
+Implicit 'set' 11 a[2] = B(2)
diff --git a/idea/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.results.txt b/idea/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.results.txt
index 1b87cdc3c47..fed791db40b 100644
--- a/idea/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.results.txt
@@ -1 +1 @@
-Property delegation (13: 15) var p: String by Delegate()
\ No newline at end of file
+Property delegation 13 var p: String by Delegate()
diff --git a/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt b/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt
index 706b8ce92ea..3237b102113 100644
--- a/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt
@@ -1,2 +1,2 @@
-Function call (10: 5) -A(1)
-Function call (9: 10) A(1).unaryMinus()
\ No newline at end of file
+Function call 10 -A(1)
+Function call 9 A(1).unaryMinus()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.results.txt
index 44a4222c2a7..f5652e80e09 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.results.txt
@@ -1 +1 @@
-Unclassified usage (1: 1) test.Foo
\ No newline at end of file
+Unclassified usage 1 test.Foo
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.results.txt
index 5d5a3ce5a5b..b5081ce0798 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.results.txt
@@ -1 +1 @@
-Unclassified usage (1: 18) <foo bar="server.Server"></foo>
\ No newline at end of file
+Unclassified usage 1 <foo bar="server.Server"></foo>
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt
index aa27029830b..3369e6b2079 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt
@@ -1,4 +1,4 @@
-Field declaration (4: 13) private Server myServer = new Server();
-Method parameter declaration (6: 27) public void setServer(Server server) {
-Method return type (10: 12) public Server getMyServer() {
-New instance creation (4: 35) private Server myServer = new Server();
\ No newline at end of file
+Field declaration 4 private Server myServer = new Server();
+Method parameter declaration 6 public void setServer(Server server) {
+Method return type 10 public Server getMyServer() {
+New instance creation 4 private Server myServer = new Server();
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.results.txt
index 61fd77b2bf8..402fe7a9ada 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.results.txt
@@ -1 +1 @@
-New instance creation (4: 35) private Server myServer = new Server();
\ No newline at end of file
+New instance creation 4 private Server myServer = new Server();
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.results.txt
index 76428ba7c2f..73d216df7b5 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.results.txt
@@ -1 +1 @@
-Unclassified usage (9: 11) x.foo("");
\ No newline at end of file
+Unclassified usage 9 x.foo("");
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.results.txt
index d0043a6766b..e24fe882b38 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.results.txt
@@ -1 +1 @@
-Unclassified usage (3: 11) a.foo("");
\ No newline at end of file
+Unclassified usage 3 a.foo("");
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.results.txt
index b9ae0e614b1..39d30146742 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.results.txt
@@ -1,3 +1,3 @@
-Field declaration (4: 13) private Server myServer = new Server();
-Method parameter declaration (6: 27) public void setServer(Server server) {
-Method return type (10: 12) public Server getMyServer() {
\ No newline at end of file
+Field declaration 4 private Server myServer = new Server();
+Method parameter declaration 6 public void setServer(Server server) {
+Method return type 10 public Server getMyServer() {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.results.txt
index 1b7db73b111..ac6bbfc7fd2 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (10: 30) System.out.println(x.getA() + " " + x.getB());
-Unclassified usage (10: 47) System.out.println(x.getA() + " " + x.getB());
-Unclassified usage (11: 11) x.setB(12);
\ No newline at end of file
+Unclassified usage 10 System.out.println(x.getA() + " " + x.getB());
+Unclassified usage 10 System.out.println(x.getA() + " " + x.getB());
+Unclassified usage 11 x.setB(12);
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.results.txt
index 728ebac6402..1304a790aa3 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (4: 30) System.out.println(a.getA() + " " + a.getB());
-Unclassified usage (4: 47) System.out.println(a.getA() + " " + a.getB());
-Unclassified usage (5: 11) a.setB(12);
\ No newline at end of file
+Unclassified usage 4 System.out.println(a.getA() + " " + a.getB());
+Unclassified usage 4 System.out.println(a.getA() + " " + a.getB());
+Unclassified usage 5 a.setB(12);
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.results.txt
index 44d53956994..267dd97c365 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.results.txt
@@ -1 +1 @@
-New instance creation (3: 13) new A()
+New instance creation 3 new A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.results.txt
index 7968096783f..05f6c7e7fc4 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.results.txt
@@ -1 +1 @@
-Unclassified usage (1: 7) class B extends A {
\ No newline at end of file
+Unclassified usage 1 class B extends A {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.results.txt
index 4b57f10b6cb..d3b1e8b6e4e 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.results.txt
@@ -1,3 +1,3 @@
-[javaDerivedClassUsages2.0.kt] Unclassified usage (11: 12) open class C: Y {
-[javaDerivedClassUsages2.0.kt] Unclassified usage (7: 12) open class A: X {
-[javaDerivedClassUsages2.1.java] Unclassified usage (1: 7) class B extends A {
\ No newline at end of file
+[javaDerivedClassUsages2.0.kt] Unclassified usage 11 open class C: Y {
+[javaDerivedClassUsages2.0.kt] Unclassified usage 7 open class A: X {
+[javaDerivedClassUsages2.1.java] Unclassified usage 1 class B extends A {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.results.txt
index a4392d1966b..b914320e2eb 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.results.txt
@@ -1,2 +1,2 @@
-[javaDerivedInterfaceUsages1.0.kt] Unclassified usage (15: 11) interface Z: A {
-[javaDerivedInterfaceUsages1.1.java] Unclassified usage (9: 11) interface U extends Z {
\ No newline at end of file
+[javaDerivedInterfaceUsages1.0.kt] Unclassified usage 15 interface Z: A {
+[javaDerivedInterfaceUsages1.1.java] Unclassified usage 9 interface U extends Z {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.results.txt
index c9bbb41822b..db65a352c0b 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.results.txt
@@ -1,3 +1,3 @@
-[javaDerivedInterfaceUsages2.0.kt] Unclassified usage (15: 11) interface Z: A {
-[javaDerivedInterfaceUsages2.1.java] Unclassified usage (5: 11) interface Y extends X {
-[javaDerivedInterfaceUsages2.1.java] Unclassified usage (9: 11) interface U extends Z {
\ No newline at end of file
+[javaDerivedInterfaceUsages2.0.kt] Unclassified usage 15 interface Z: A {
+[javaDerivedInterfaceUsages2.1.java] Unclassified usage 5 interface Y extends X {
+[javaDerivedInterfaceUsages2.1.java] Unclassified usage 9 interface U extends Z {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt
index d12541459cd..2d1efba63bc 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt
@@ -1,22 +1,22 @@
-Class/object property type (6: 21) var nextServer: Server? = new Server()
-Companion object (38: 28) fun Client.bar(s: Server = Server.NAME) {
-Companion object (5: 29) class Client(name: String = Server.NAME): Server() {
-Companion object (7: 16) val name = Server.NAME
-Function return types (14: 26) fun getNextServer(): Server? {
-Function return types (46: 21) fun Any.asServer(): Server? {
-Local variable declaration (10: 21) val server: Server = s
-Parameter type (38: 19) fun Client.bar(s: Server = Server.NAME) {
-Parameter type (9: 16) fun foo(s: Server) {
-Super type qualifier (19: 15) super<Server>.work()
-Supertype (23: 23) companion object: Server() {
-Supertype (28: 22) object ClientObject: Server() {
-Supertype (5: 43) class Client(name: String = Server.NAME): Server() {
-Target type of 'is' operation (48: 12) is Server -> println("Server!")
-Target type of 'is' operation (50: 24) return if (this is Server) this as Server else this as? Server
-Type parameter (32: 25) class Servers: Iterator<Server> {
-Type parameter (36: 14) fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
-Type parameter (36: 36) fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
-Type parameter (36: 55) fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
-Usage in cast target type (50: 40) return if (this is Server) this as Server else this as? Server
-Usage in cast target type (50: 61) return if (this is Server) this as Server else this as? Server
-Usage in import (3: 15) import server.Server
+Class/object property type 6 var nextServer: Server? = new Server()
+Companion object 38 fun Client.bar(s: Server = Server.NAME) {
+Companion object 5 class Client(name: String = Server.NAME): Server() {
+Companion object 7 val name = Server.NAME
+Function return types 14 fun getNextServer(): Server? {
+Function return types 46 fun Any.asServer(): Server? {
+Local variable declaration 10 val server: Server = s
+Parameter type 38 fun Client.bar(s: Server = Server.NAME) {
+Parameter type 9 fun foo(s: Server) {
+Super type qualifier 19 super<Server>.work()
+Supertype 23 companion object: Server() {
+Supertype 28 object ClientObject: Server() {
+Supertype 5 class Client(name: String = Server.NAME): Server() {
+Target type of 'is' operation 48 is Server -> println("Server!")
+Target type of 'is' operation 50 return if (this is Server) this as Server else this as? Server
+Type parameter 32 class Servers: Iterator<Server> {
+Type parameter 36 fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
+Type parameter 36 fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
+Type parameter 36 fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
+Usage in cast target type 50 return if (this is Server) this as Server else this as? Server
+Usage in cast target type 50 return if (this is Server) this as Server else this as? Server
+Usage in import 3 import server.Server
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt
index 64eca9b6d4d..8eff2fb22a8 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt
@@ -1,2 +1,2 @@
-Annotation (5: 2) @X("")
-Usage in import (3: 15) import server.X
+Annotation 5 @X("")
+Usage in import 3 import server.X
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.results.txt
index 0cbb2ef3b4e..c031d2a8378 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.results.txt
@@ -1,4 +1,4 @@
-Type constraint (5: 17) class Client<T: Data, X> where X: Data {
-Type constraint (5: 35) class Client<T: Data, X> where X: Data {
-Type parameter (9: 16) val c = Client<Data/*, [ERROR]*/>()
-Usage in import (3: 15) import server.Data
+Type constraint 5 class Client<T: Data, X> where X: Data {
+Type constraint 5 class Client<T: Data, X> where X: Data {
+Type parameter 9 val c = Client<Data/*, [ERROR]*/>()
+Usage in import 3 import server.Data
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.results.txt
index bbb8d55d8b8..c3d9a646dcf 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.results.txt
@@ -1,2 +1,2 @@
-Super type qualifier (7: 15) super<Server>.work()
-Supertype (5: 17) class Client(): Server() {
+Super type qualifier 7 super<Server>.work()
+Supertype 5 class Client(): Server() {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.results.txt
index 23062dcb4a6..1c52a090d5e 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.results.txt
@@ -1,5 +1,5 @@
-[kotlinClassConstructorUsages.0.kt] Unclassified usage (6: 32) constructor(name: String): this() {
-[kotlinClassConstructorUsages.1.kt] Supertype (24: 22) object ClientObject: Server() {
-[kotlinClassConstructorUsages.1.kt] Supertype (5: 15) class Client: Server() {
-[kotlinClassConstructorUsages.1.kt] Unclassified usage (29: 31) constructor(name: String) {
-[kotlinClassConstructorUsages.1.kt] Unclassified usage (33: 20) constructor(): super() {
\ No newline at end of file
+[kotlinClassConstructorUsages.0.kt] Unclassified usage 6 constructor(name: String): this() {
+[kotlinClassConstructorUsages.1.kt] Supertype 24 object ClientObject: Server() {
+[kotlinClassConstructorUsages.1.kt] Supertype 5 class Client: Server() {
+[kotlinClassConstructorUsages.1.kt] Unclassified usage 29 constructor(name: String) {
+[kotlinClassConstructorUsages.1.kt] Unclassified usage 33 constructor(): super() {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.results.txt
index 0dd090298ab..24717417947 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (13: 17) doSomething(object : A() {}, object: Z {})
-Unclassified usage (13: 34) doSomething(object : A() {}, object: Z {})
-Unclassified usage (16: 17) val x = object: Z {
\ No newline at end of file
+Unclassified usage 13 doSomething(object : A() {}, object: Z {})
+Unclassified usage 13 doSomething(object : A() {}, object: Z {})
+Unclassified usage 16 val x = object: Z {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.results.txt
index 244b907ed4d..eaff47daaf0 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.results.txt
@@ -1 +1 @@
-Unclassified usage (3: 12) open class B: A() {
\ No newline at end of file
+Unclassified usage 3 open class B: A() {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.results.txt
index f929716dcbe..9375b4ccabe 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (17: 15) class U: Z {
-Unclassified usage (4: 16) open class B: A() {
+Unclassified usage 17 class U: Z {
+Unclassified usage 4 open class B: A() {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.results.txt
index f13a5b4c5ac..ffdd0f0b460 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (11: 16) object O2: Z
-Unclassified usage (8: 12) object O1: A()
+Unclassified usage 11 object O2: Z
+Unclassified usage 8 object O1: A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.results.txt
index 7defdbe8c3c..bfece3274e0 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.results.txt
@@ -1 +1 @@
-Unclassified usage (5: 16) open class B: A() {
+Unclassified usage 5 open class B: A() {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.results.txt
index dc3a5714c1c..e4c762983b5 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (12: 16) object O2: Z
-Unclassified usage (9: 12) object O1: A()
+Unclassified usage 12 object O2: Z
+Unclassified usage 9 object O1: A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.results.txt
index 880c25297da..c4eb3138d14 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (14: 19) interface Z: A {
-Unclassified usage (18: 19) interface U: Z {
\ No newline at end of file
+Unclassified usage 14 interface Z: A {
+Unclassified usage 18 interface U: Z {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.results.txt
index 3f6b2ac603b..f0e6aa398d9 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (7: 8) object O1: A()
-Unclassified usage (9: 8) object O2: Z
+Unclassified usage 7 object O1: A()
+Unclassified usage 9 object O2: Z
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.results.txt
index d580ff914b6..6acb0bdd207 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (11: 11) interface Z: A {
-Unclassified usage (15: 11) interface U: Z {
\ No newline at end of file
+Unclassified usage 11 interface Z: A {
+Unclassified usage 15 interface U: Z {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.results.txt
index ccfa47f04f6..2ab70714701 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.results.txt
@@ -1 +1 @@
-Function call (9: 11) x.foo("")
\ No newline at end of file
+Function call 9 x.foo("")
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.results.txt
index 44d92d07669..859b7d26607 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.results.txt
@@ -1 +1 @@
-Function call (3: 11) a.foo("")
\ No newline at end of file
+Function call 3 a.foo("")
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt
index 68c13346dd7..8bec4ccb2d6 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt
@@ -1,13 +1,13 @@
-Class/object property type (6: 21) var nextServer: Server? = new Server()
-Companion object (28: 28) fun Client.bar(s: Server = Server.NAME) {
-Companion object (5: 29) class Client(name: String = Server.NAME): Server() {
-Companion object (7: 16) val name = Server.NAME
-Function return types (14: 26) fun getNextServer(): Server? {
-Function return types (36: 21) fun Any.asServer(): Server? {
-Local variable declaration (10: 21) val server: Server = s
-Parameter type (28: 19) fun Client.bar(s: Server = Server.NAME) {
-Parameter type (9: 16) fun foo(s: Server) {
-Super type qualifier (19: 15) super<Server>.work()
-Target type of 'is' operation (37: 24) return if (this is Server) this as Server else null
-Usage in cast target type (37: 40) return if (this is Server) this as Server else null
-Usage in import (3: 15) import server.Server
+Class/object property type 6 var nextServer: Server? = new Server()
+Companion object 28 fun Client.bar(s: Server = Server.NAME) {
+Companion object 5 class Client(name: String = Server.NAME): Server() {
+Companion object 7 val name = Server.NAME
+Function return types 14 fun getNextServer(): Server? {
+Function return types 36 fun Any.asServer(): Server? {
+Local variable declaration 10 val server: Server = s
+Parameter type 28 fun Client.bar(s: Server = Server.NAME) {
+Parameter type 9 fun foo(s: Server) {
+Super type qualifier 19 super<Server>.work()
+Target type of 'is' operation 37 return if (this is Server) this as Server else null
+Usage in cast target type 37 return if (this is Server) this as Server else null
+Usage in import 3 import server.Server
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.results.txt
index acf261bdc13..060587bfbe0 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.results.txt
@@ -1,3 +1,3 @@
-Value read (10: 22) println("${x.a} ${x.b}")
-Value read (10: 29) println("${x.a} ${x.b}")
-Value write (11: 11) x.b = 12
\ No newline at end of file
+Value read 10 println("${x.a} ${x.b}")
+Value read 10 println("${x.a} ${x.b}")
+Value write 11 x.b = 12
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.results.txt
index 0dc835e5a88..433dcd34100 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.results.txt
@@ -1,6 +1,6 @@
-Value read (4: 22) println("${a.a} ${a.b}")
-Value read (4: 29) println("${a.a} ${a.b}")
-Value read (5: 22) println("${a.t} ${a.u}")
-Value read (5: 29) println("${a.t} ${a.u}")
-Value write (6: 11) a.b = 12
-Value write (7: 11) a.u = 13
\ No newline at end of file
+Value read 4 println("${a.a} ${a.b}")
+Value read 4 println("${a.a} ${a.b}")
+Value read 5 println("${a.t} ${a.u}")
+Value read 5 println("${a.t} ${a.u}")
+Value write 6 a.b = 12
+Value write 7 a.u = 13
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.results.txt
index b05ebb8ef45..0e4d7f94bae 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.results.txt
@@ -1 +1 @@
-New instance creation (2: 5) A()
+New instance creation 2 A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt
index 379dc2251b8..193330fb709 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt
@@ -1,21 +1,21 @@
-[kotlinDeeplyNestedClassAllUsages.1.kt] Class/object property type (6: 21) var next: Inner.A? = Inner.A()
-[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object (10: 15) Inner.A.bar = ""
-[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object (11: 15) Inner.A.foo()
-[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object (5: 37) public class X(bar: String? = Inner.A.bar): Inner.A() {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object (7: 32) val myBar: String? = Inner.A.bar
-[kotlinDeeplyNestedClassAllUsages.1.kt] Function return types (19: 26) fun getNext(): Inner.A? {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Function return types (40: 22) fun Any.toA(): Inner.A? {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Local variable declaration (15: 23) val aa: Inner.A = a
-[kotlinDeeplyNestedClassAllUsages.1.kt] New instance creation (36: 30) fun X.bar(a: Inner.A = Inner.A()) {
-[kotlinDeeplyNestedClassAllUsages.1.kt] New instance creation (6: 32) var next: Inner.A? = Inner.A()
-[kotlinDeeplyNestedClassAllUsages.1.kt] Parameter type (14: 22) fun foo(a: Inner.A) {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Parameter type (36: 20) fun X.bar(a: Inner.A = Inner.A()) {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Super type qualifier (24: 21) super<Inner.A>.foo()
-[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype (27: 29) companion object: Inner.A() {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype (32: 17) object O: Inner.A() {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype (5: 51) public class X(bar: String? = Inner.A.bar): Inner.A() {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Target type of 'is' operation (41: 30) return if (this is Inner.A) this as Inner.A else null
-[kotlinDeeplyNestedClassAllUsages.1.kt] Usage in cast target type (41: 47) return if (this is Inner.A) this as Inner.A else null
-[kotlinDeeplyNestedClassAllUsages.2.java] Field declaration (6: 11) Inner.A next = new Inner.A();
-[kotlinDeeplyNestedClassAllUsages.2.java] New instance creation (6: 30) Inner.A next = new Inner.A();
-[kotlinDeeplyNestedClassAllUsages.2.java] Usage in extends/implements clause (5: 30) public class X extends Inner.A {
\ No newline at end of file
+[kotlinDeeplyNestedClassAllUsages.1.kt] Class/object property type 6 var next: Inner.A? = Inner.A()
+[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object 10 Inner.A.bar = ""
+[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object 11 Inner.A.foo()
+[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object 5 public class X(bar: String? = Inner.A.bar): Inner.A() {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object 7 val myBar: String? = Inner.A.bar
+[kotlinDeeplyNestedClassAllUsages.1.kt] Function return types 19 fun getNext(): Inner.A? {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Function return types 40 fun Any.toA(): Inner.A? {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Local variable declaration 15 val aa: Inner.A = a
+[kotlinDeeplyNestedClassAllUsages.1.kt] New instance creation 36 fun X.bar(a: Inner.A = Inner.A()) {
+[kotlinDeeplyNestedClassAllUsages.1.kt] New instance creation 6 var next: Inner.A? = Inner.A()
+[kotlinDeeplyNestedClassAllUsages.1.kt] Parameter type 14 fun foo(a: Inner.A) {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Parameter type 36 fun X.bar(a: Inner.A = Inner.A()) {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Super type qualifier 24 super<Inner.A>.foo()
+[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype 27 companion object: Inner.A() {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype 32 object O: Inner.A() {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype 5 public class X(bar: String? = Inner.A.bar): Inner.A() {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Target type of 'is' operation 41 return if (this is Inner.A) this as Inner.A else null
+[kotlinDeeplyNestedClassAllUsages.1.kt] Usage in cast target type 41 return if (this is Inner.A) this as Inner.A else null
+[kotlinDeeplyNestedClassAllUsages.2.java] Field declaration 6 Inner.A next = new Inner.A();
+[kotlinDeeplyNestedClassAllUsages.2.java] New instance creation 6 Inner.A next = new Inner.A();
+[kotlinDeeplyNestedClassAllUsages.2.java] Usage in extends/implements clause 5 public class X extends Inner.A {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.results.txt
index 1a17b968dd8..c338c8804a2 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.results.txt
@@ -1,21 +1,21 @@
-[kotlinInnerClassAllUsages.1.kt] Class/object property type (7: 25) var next: Outer.A? = (this@KOuter as Outer).A()
-[kotlinInnerClassAllUsages.1.kt] Function return types (19: 30) fun getNext(): Outer.A? {
-[kotlinInnerClassAllUsages.1.kt] Function return types (33: 22) fun Any.toA(): Outer.A? {
-[kotlinInnerClassAllUsages.1.kt] Function return types (37: 27) fun Any.asServer(): Outer.A? {
-[kotlinInnerClassAllUsages.1.kt] Local variable declaration (15: 27) val aa: Outer.A = a
-[kotlinInnerClassAllUsages.1.kt] New instance creation (11: 36) (this@KOuter as Outer).A().bar = ""
-[kotlinInnerClassAllUsages.1.kt] New instance creation (29: 39) fun KOuter.X.bar(a: Outer.A = Outer().A()) {
-[kotlinInnerClassAllUsages.1.kt] New instance creation (6: 64) public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
-[kotlinInnerClassAllUsages.1.kt] New instance creation (7: 53) var next: Outer.A? = (this@KOuter as Outer).A()
-[kotlinInnerClassAllUsages.1.kt] New instance creation (8: 53) val myBar: String? = (this@KOuter as Outer).A().bar
-[kotlinInnerClassAllUsages.1.kt] Parameter type (14: 26) fun foo(a: Outer.A) {
-[kotlinInnerClassAllUsages.1.kt] Parameter type (29: 27) fun KOuter.X.bar(a: Outer.A = Outer().A()) {
-[kotlinInnerClassAllUsages.1.kt] Super type qualifier (24: 25) super<Outer.A>.foo()
-[kotlinInnerClassAllUsages.1.kt] Supertype (6: 80) public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
-[kotlinInnerClassAllUsages.1.kt] Target type of 'is' operation (34: 30) return if (this is Outer.A) this as Outer.A else null
-[kotlinInnerClassAllUsages.1.kt] Target type of 'is' operation (38: 30) return if (this is Outer.A) this as Outer.A else null
-[kotlinInnerClassAllUsages.1.kt] Usage in cast target type (34: 47) return if (this is Outer.A) this as Outer.A else null
-[kotlinInnerClassAllUsages.1.kt] Usage in cast target type (38: 47) return if (this is Outer.A) this as Outer.A else null
-[kotlinInnerClassAllUsages.2.java] Field declaration (10: 5) A next = new A();
-[kotlinInnerClassAllUsages.2.java] New instance creation (10: 18) A next = new A();
-[kotlinInnerClassAllUsages.2.java] Usage in extends/implements clause (6: 21) class Y extends A {
\ No newline at end of file
+[kotlinInnerClassAllUsages.1.kt] Class/object property type 7 var next: Outer.A? = (this@KOuter as Outer).A()
+[kotlinInnerClassAllUsages.1.kt] Function return types 19 fun getNext(): Outer.A? {
+[kotlinInnerClassAllUsages.1.kt] Function return types 33 fun Any.toA(): Outer.A? {
+[kotlinInnerClassAllUsages.1.kt] Function return types 37 fun Any.asServer(): Outer.A? {
+[kotlinInnerClassAllUsages.1.kt] Local variable declaration 15 val aa: Outer.A = a
+[kotlinInnerClassAllUsages.1.kt] New instance creation 11 (this@KOuter as Outer).A().bar = ""
+[kotlinInnerClassAllUsages.1.kt] New instance creation 29 fun KOuter.X.bar(a: Outer.A = Outer().A()) {
+[kotlinInnerClassAllUsages.1.kt] New instance creation 6 public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
+[kotlinInnerClassAllUsages.1.kt] New instance creation 7 var next: Outer.A? = (this@KOuter as Outer).A()
+[kotlinInnerClassAllUsages.1.kt] New instance creation 8 val myBar: String? = (this@KOuter as Outer).A().bar
+[kotlinInnerClassAllUsages.1.kt] Parameter type 14 fun foo(a: Outer.A) {
+[kotlinInnerClassAllUsages.1.kt] Parameter type 29 fun KOuter.X.bar(a: Outer.A = Outer().A()) {
+[kotlinInnerClassAllUsages.1.kt] Super type qualifier 24 super<Outer.A>.foo()
+[kotlinInnerClassAllUsages.1.kt] Supertype 6 public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
+[kotlinInnerClassAllUsages.1.kt] Target type of 'is' operation 34 return if (this is Outer.A) this as Outer.A else null
+[kotlinInnerClassAllUsages.1.kt] Target type of 'is' operation 38 return if (this is Outer.A) this as Outer.A else null
+[kotlinInnerClassAllUsages.1.kt] Usage in cast target type 34 return if (this is Outer.A) this as Outer.A else null
+[kotlinInnerClassAllUsages.1.kt] Usage in cast target type 38 return if (this is Outer.A) this as Outer.A else null
+[kotlinInnerClassAllUsages.2.java] Field declaration 10 A next = new A();
+[kotlinInnerClassAllUsages.2.java] New instance creation 10 A next = new A();
+[kotlinInnerClassAllUsages.2.java] Usage in extends/implements clause 6 class Y extends A {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt
index 25345dc6354..b59f915604f 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (11: 17) val c = object: A() {}
-Unclassified usage (13: 17) val d = object: T {}
-Unclassified usage (6: 13) val b = object: A() {}
+Unclassified usage 11 val c = object: A() {}
+Unclassified usage 13 val d = object: T {}
+Unclassified usage 6 val b = object: A() {}
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.results.txt
index 375b8f1f35e..0b1dc6b1d15 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (11: 15) class C: A()
-Unclassified usage (13: 15) class D: T
-Unclassified usage (6: 11) class B: A()
+Unclassified usage 11 class C: A()
+Unclassified usage 13 class D: T
+Unclassified usage 6 class B: A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.results.txt
index be0585dfab1..e4e3b0916ad 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage (11: 16) object C: A()
-Unclassified usage (13: 16) object D: T
-Unclassified usage (6: 12) object B: A()
+Unclassified usage 11 object C: A()
+Unclassified usage 13 object D: T
+Unclassified usage 6 object B: A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.results.txt
index 1937920df81..909840a4615 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (6: 15) interface T: A
-Unclassified usage (9: 19) interface U: T
\ No newline at end of file
+Unclassified usage 6 interface T: A
+Unclassified usage 9 interface U: T
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.results.txt
index 9ce8c4db2f3..c9d2d90f356 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.results.txt
@@ -1 +1 @@
-New instance creation (6: 12) return Bar()
+New instance creation 6 return Bar()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.results.txt
index b5a77b8b7d6..52865405118 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.results.txt
@@ -1 +1 @@
-New instance creation (7: 16) return Bar()
+New instance creation 7 return Bar()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt
index a63fd0c00da..257513f4caa 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt
@@ -1,21 +1,21 @@
-[kotlinNestedClassAllUsages.1.kt] Class/object property type (6: 21) var next: Outer.A? = Outer.A()
-[kotlinNestedClassAllUsages.1.kt] Companion object (10: 15) Outer.A.bar = ""
-[kotlinNestedClassAllUsages.1.kt] Companion object (11: 15) Outer.A.foo()
-[kotlinNestedClassAllUsages.1.kt] Companion object (5: 37) public class X(bar: String? = Outer.A.bar): Outer.A() {
-[kotlinNestedClassAllUsages.1.kt] Companion object (7: 32) val myBar: String? = Outer.A.bar
-[kotlinNestedClassAllUsages.1.kt] Function return types (19: 26) fun getNext(): Outer.A? {
-[kotlinNestedClassAllUsages.1.kt] Function return types (40: 22) fun Any.toA(): Outer.A? {
-[kotlinNestedClassAllUsages.1.kt] Local variable declaration (15: 23) val aa: Outer.A = a
-[kotlinNestedClassAllUsages.1.kt] New instance creation (36: 30) fun X.bar(a: Outer.A = Outer.A()) {
-[kotlinNestedClassAllUsages.1.kt] New instance creation (6: 32) var next: Outer.A? = Outer.A()
-[kotlinNestedClassAllUsages.1.kt] Parameter type (14: 22) fun foo(a: Outer.A) {
-[kotlinNestedClassAllUsages.1.kt] Parameter type (36: 20) fun X.bar(a: Outer.A = Outer.A()) {
-[kotlinNestedClassAllUsages.1.kt] Super type qualifier (24: 21) super<Outer.A>.foo()
-[kotlinNestedClassAllUsages.1.kt] Supertype (27: 29) companion object: Outer.A() {
-[kotlinNestedClassAllUsages.1.kt] Supertype (32: 17) object O: Outer.A() {
-[kotlinNestedClassAllUsages.1.kt] Supertype (5: 51) public class X(bar: String? = Outer.A.bar): Outer.A() {
-[kotlinNestedClassAllUsages.1.kt] Target type of 'is' operation (41: 30) return if (this is Outer.A) this as Outer.A else null
-[kotlinNestedClassAllUsages.1.kt] Usage in cast target type (41: 47) return if (this is Outer.A) this as Outer.A else null
-[kotlinNestedClassAllUsages.2.java] Field declaration (6: 11) Outer.A next = new Outer.A();
-[kotlinNestedClassAllUsages.2.java] New instance creation (6: 30) Outer.A next = new Outer.A();
-[kotlinNestedClassAllUsages.2.java] Usage in extends/implements clause (5: 30) public class X extends Outer.A {
\ No newline at end of file
+[kotlinNestedClassAllUsages.1.kt] Class/object property type 6 var next: Outer.A? = Outer.A()
+[kotlinNestedClassAllUsages.1.kt] Companion object 10 Outer.A.bar = ""
+[kotlinNestedClassAllUsages.1.kt] Companion object 11 Outer.A.foo()
+[kotlinNestedClassAllUsages.1.kt] Companion object 5 public class X(bar: String? = Outer.A.bar): Outer.A() {
+[kotlinNestedClassAllUsages.1.kt] Companion object 7 val myBar: String? = Outer.A.bar
+[kotlinNestedClassAllUsages.1.kt] Function return types 19 fun getNext(): Outer.A? {
+[kotlinNestedClassAllUsages.1.kt] Function return types 40 fun Any.toA(): Outer.A? {
+[kotlinNestedClassAllUsages.1.kt] Local variable declaration 15 val aa: Outer.A = a
+[kotlinNestedClassAllUsages.1.kt] New instance creation 36 fun X.bar(a: Outer.A = Outer.A()) {
+[kotlinNestedClassAllUsages.1.kt] New instance creation 6 var next: Outer.A? = Outer.A()
+[kotlinNestedClassAllUsages.1.kt] Parameter type 14 fun foo(a: Outer.A) {
+[kotlinNestedClassAllUsages.1.kt] Parameter type 36 fun X.bar(a: Outer.A = Outer.A()) {
+[kotlinNestedClassAllUsages.1.kt] Super type qualifier 24 super<Outer.A>.foo()
+[kotlinNestedClassAllUsages.1.kt] Supertype 27 companion object: Outer.A() {
+[kotlinNestedClassAllUsages.1.kt] Supertype 32 object O: Outer.A() {
+[kotlinNestedClassAllUsages.1.kt] Supertype 5 public class X(bar: String? = Outer.A.bar): Outer.A() {
+[kotlinNestedClassAllUsages.1.kt] Target type of 'is' operation 41 return if (this is Outer.A) this as Outer.A else null
+[kotlinNestedClassAllUsages.1.kt] Usage in cast target type 41 return if (this is Outer.A) this as Outer.A else null
+[kotlinNestedClassAllUsages.2.java] Field declaration 6 Outer.A next = new Outer.A();
+[kotlinNestedClassAllUsages.2.java] New instance creation 6 Outer.A next = new Outer.A();
+[kotlinNestedClassAllUsages.2.java] Usage in extends/implements clause 5 public class X extends Outer.A {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.results.txt
index 91eb967b3ba..4378695e2b1 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.results.txt
@@ -1 +1 @@
-New instance creation (10: 33) open fun processRequest() = Foo()
+New instance creation 10 open fun processRequest() = Foo()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.results.txt
index 7da983667a5..2cea6909960 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.results.txt
@@ -1,4 +1,4 @@
-[kotlinTraitDerivedAnonymousObjects.0.kt] Unclassified usage (7: 12) open class A: X {
-[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage (12: 17) val x = object : X {
-[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage (9: 17) doSomething(object : A() {}, object: X {})
-[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage (9: 34) doSomething(object : A() {}, object: X {})
\ No newline at end of file
+[kotlinTraitDerivedAnonymousObjects.0.kt] Unclassified usage 7 open class A: X {
+[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage 12 val x = object : X {
+[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage 9 doSomething(object : A() {}, object: X {})
+[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage 9 doSomething(object : A() {}, object: X {})
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.results.txt
index b7acb8865a6..0f1b045ff4c 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedClasses.0.kt] Unclassified usage (7: 12) open class A: X {
-[kotlinTraitDerivedClasses.1.kt] Unclassified usage (3: 12) open class B: A() {
-[kotlinTraitDerivedClasses.1.kt] Unclassified usage (7: 12) open class C: Y {
\ No newline at end of file
+[kotlinTraitDerivedClasses.0.kt] Unclassified usage 7 open class A: X {
+[kotlinTraitDerivedClasses.1.kt] Unclassified usage 3 open class B: A() {
+[kotlinTraitDerivedClasses.1.kt] Unclassified usage 7 open class C: Y {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.results.txt
index 4a08b2441a0..2dbbeb660f7 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedInnerClasses.0.kt] Unclassified usage (7: 12) open class A: X {
-[kotlinTraitDerivedInnerClasses.1.kt] Unclassified usage (4: 16) open class B: A() {
-[kotlinTraitDerivedInnerClasses.1.kt] Unclassified usage (8: 16) open class C: Y {
\ No newline at end of file
+[kotlinTraitDerivedInnerClasses.0.kt] Unclassified usage 7 open class A: X {
+[kotlinTraitDerivedInnerClasses.1.kt] Unclassified usage 4 open class B: A() {
+[kotlinTraitDerivedInnerClasses.1.kt] Unclassified usage 8 open class C: Y {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.results.txt
index 60a804ff68b..f46863d1584 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedInnerObjects.0.kt] Unclassified usage (7: 12) open class A: X {
-[kotlinTraitDerivedInnerObjects.1.kt] Unclassified usage (4: 12) object O1: A() {
-[kotlinTraitDerivedInnerObjects.1.kt] Unclassified usage (9: 16) object O2: X {
\ No newline at end of file
+[kotlinTraitDerivedInnerObjects.0.kt] Unclassified usage 7 open class A: X {
+[kotlinTraitDerivedInnerObjects.1.kt] Unclassified usage 4 object O1: A() {
+[kotlinTraitDerivedInnerObjects.1.kt] Unclassified usage 9 object O2: X {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.results.txt
index f3ece4e3dd6..990ef3e850e 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedLocalClasses.0.kt] Unclassified usage (7: 12) open class A: X {
-[kotlinTraitDerivedLocalClasses.1.kt] Unclassified usage (5: 16) open class B: A() {
-[kotlinTraitDerivedLocalClasses.1.kt] Unclassified usage (9: 16) open class C: Y {
\ No newline at end of file
+[kotlinTraitDerivedLocalClasses.0.kt] Unclassified usage 7 open class A: X {
+[kotlinTraitDerivedLocalClasses.1.kt] Unclassified usage 5 open class B: A() {
+[kotlinTraitDerivedLocalClasses.1.kt] Unclassified usage 9 open class C: Y {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.results.txt
index 0b762856c56..cd812ff5447 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedLocalObjects.0.kt] Unclassified usage (7: 12) open class A: X {
-[kotlinTraitDerivedLocalObjects.1.kt] Unclassified usage (10: 16) object O2: X {
-[kotlinTraitDerivedLocalObjects.1.kt] Unclassified usage (5: 12) object O1: A() {
\ No newline at end of file
+[kotlinTraitDerivedLocalObjects.0.kt] Unclassified usage 7 open class A: X {
+[kotlinTraitDerivedLocalObjects.1.kt] Unclassified usage 10 object O2: X {
+[kotlinTraitDerivedLocalObjects.1.kt] Unclassified usage 5 object O1: A() {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.results.txt
index f6afce4bd96..5cc8e028906 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (10: 19) interface Z: A {
-Unclassified usage (14: 19) interface U: Z {
\ No newline at end of file
+Unclassified usage 10 interface Z: A {
+Unclassified usage 14 interface U: Z {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.results.txt
index 0743125f3b3..7b6d2070362 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedObjects.0.kt] Unclassified usage (7: 12) open class A: X {
-[kotlinTraitDerivedObjects.1.kt] Unclassified usage (3: 8) object O1: A() {
-[kotlinTraitDerivedObjects.1.kt] Unclassified usage (7: 8) object O2: X {
\ No newline at end of file
+[kotlinTraitDerivedObjects.0.kt] Unclassified usage 7 open class A: X {
+[kotlinTraitDerivedObjects.1.kt] Unclassified usage 3 object O1: A() {
+[kotlinTraitDerivedObjects.1.kt] Unclassified usage 7 object O2: X {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.results.txt
index 2885a17069c..a94ff5cbda5 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedTraits.0.kt] Unclassified usage (11: 11) interface Y: X {
-[kotlinTraitDerivedTraits.1.kt] Unclassified usage (11: 11) interface Z: A {
-[kotlinTraitDerivedTraits.1.kt] Unclassified usage (15: 11) interface U: Z {
\ No newline at end of file
+[kotlinTraitDerivedTraits.0.kt] Unclassified usage 11 interface Y: X {
+[kotlinTraitDerivedTraits.1.kt] Unclassified usage 11 interface Z: A {
+[kotlinTraitDerivedTraits.1.kt] Unclassified usage 15 interface U: Z {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.results.txt
index 31640d47478..6a1a096c590 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.results.txt
@@ -1 +1 @@
-New instance creation (10: 5) C()
\ No newline at end of file
+New instance creation 10 C()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.results.txt
index 6c922e196f9..662e84f1a2e 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.results.txt
@@ -1,2 +1,2 @@
-New instance creation (6: 5) A(0)
-New instance creation (7: 5) A()
\ No newline at end of file
+New instance creation 6 A(0)
+New instance creation 7 A()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.results.txt
index d06564f35f8..43b1bb60ff3 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.results.txt
@@ -1,3 +1,3 @@
-Function call (14: 13) foo(1)
-Function call (21: 9) foo(1)
-Function call (7: 13) foo(1)
\ No newline at end of file
+Function call 14 foo(1)
+Function call 21 foo(1)
+Function call 7 foo(1)
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.results.txt
index ece64a3e1f9..fb372232e0c 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.results.txt
@@ -1 +1 @@
-Unclassified usage (1: 10) Function foo is defined in class Foo
\ No newline at end of file
+Unclassified usage 1 Function foo is defined in class Foo
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/highlightingOfSuperUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/highlightingOfSuperUsages.results.txt
index 3fb6c8639ff..e221ea2ce6f 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/highlightingOfSuperUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/highlightingOfSuperUsages.results.txt
@@ -1,3 +1,3 @@
-Function call (14: 7) i.foo()
-Function call (15: 9) A().foo()
-Function call (16: 9) B().foo()
\ No newline at end of file
+Function call 14 i.foo()
+Function call 15 A().foo()
+Function call 16 B().foo()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.results.txt
index 70e06120f1f..3fd4095b943 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.results.txt
@@ -1,2 +1,2 @@
-[javaAndKotlinOverrides.0.kt] Unclassified usage (29: 18) override fun foo(t: String) {
-[javaAndKotlinOverrides.1.java] Unclassified usage (3: 17) public void foo(String s) {
\ No newline at end of file
+[javaAndKotlinOverrides.0.kt] Unclassified usage 29 override fun foo(t: String) {
+[javaAndKotlinOverrides.1.java] Unclassified usage 3 public void foo(String s) {
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.results.txt
index 60610682c1d..a5753f3224f 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (5: 22) new Server().processRequest();
-Unclassified usage (6: 24) new ServerEx().processRequest();
\ No newline at end of file
+Unclassified usage 5 new Server().processRequest();
+Unclassified usage 6 new ServerEx().processRequest();
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.results.txt
index 3f5d017960e..2a41be23d4e 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage (11: 13) Foo.foo(1, 1.0);
-Unclassified usage (15: 13) Foo.foo(1, 1.0, "1");
-Unclassified usage (3: 13) Foo.foo();
-Unclassified usage (7: 13) Foo.foo(1);
\ No newline at end of file
+Unclassified usage 11 Foo.foo(1, 1.0);
+Unclassified usage 15 Foo.foo(1, 1.0, "1");
+Unclassified usage 3 Foo.foo();
+Unclassified usage 7 Foo.foo(1);
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.results.txt
index afc030e0d85..89645268347 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.results.txt
@@ -1,2 +1,2 @@
-Function call (5: 18) Server().processRequest()
-Function call (6: 20) ServerEx().processRequest()
+Function call 5 Server().processRequest()
+Function call 6 ServerEx().processRequest()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.results.txt
index 996c08ca343..d556a995ee2 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.results.txt
@@ -1,2 +1 @@
-Function call (8: 5) bar()
-
+Function call 8 bar()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.results.txt
index b5852c12963..034575b3312 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.results.txt
@@ -1,2 +1 @@
-Function call (9: 9) bar()
-
+Function call 9 bar()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.results.txt
index 669a9568fa7..89645268347 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.results.txt
@@ -1,2 +1,2 @@
-Function call (5: 18) Server().processRequest()
-Function call (6: 20) ServerEx().processRequest()
\ No newline at end of file
+Function call 5 Server().processRequest()
+Function call 6 ServerEx().processRequest()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.results.txt
index 6173c25cf0c..4a1d3c7bbe9 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.results.txt
@@ -1,2 +1,2 @@
-Function call (8: 5) foo()
-Usage in import (5: 15) import server.foo
+Function call 8 foo()
+Usage in import 5 import server.foo
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.results.txt
index 1c61730b2b2..90e10d6ea21 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.results.txt
@@ -1 +1 @@
-Unclassified usage (7: 27) new Outer.Inner().foo();
+Unclassified usage 7 new Outer.Inner().foo();
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt
index 79178a3c3df..ee51ac2ceb0 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt
@@ -1,7 +1,7 @@
-[kotlinOverloadAndExtensionUsages.0.kt] Function call (11: 7) x.foo(1, 2)
-[kotlinOverloadAndExtensionUsages.0.kt] Function call (25: 5) foo(t)
-[kotlinOverloadAndExtensionUsages.0.kt] Function call (30: 7) a.foo(1, "")
-[kotlinOverloadAndExtensionUsages.0.kt] Function call (35: 9) foo(t)
-[kotlinOverloadAndExtensionUsages.0.kt] Function call (39: 5) foo(s)
-[kotlinOverloadAndExtensionUsages.1.kt] Function call (11: 11) a.foo(0, "")
-[kotlinOverloadAndExtensionUsages.1.kt] Function call (3: 18) super<A>.foo(t)
\ No newline at end of file
+[kotlinOverloadAndExtensionUsages.0.kt] Function call 11 x.foo(1, 2)
+[kotlinOverloadAndExtensionUsages.0.kt] Function call 25 foo(t)
+[kotlinOverloadAndExtensionUsages.0.kt] Function call 30 a.foo(1, "")
+[kotlinOverloadAndExtensionUsages.0.kt] Function call 35 foo(t)
+[kotlinOverloadAndExtensionUsages.0.kt] Function call 39 foo(s)
+[kotlinOverloadAndExtensionUsages.1.kt] Function call 11 a.foo(0, "")
+[kotlinOverloadAndExtensionUsages.1.kt] Function call 3 super<A>.foo(t)
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt
index be31093399a..1254183e449 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt
@@ -1,3 +1,3 @@
-Function call (11: 11) O.foo()
-Function call (3: 11) a.foo("")
-Function call (7: 11) x.foo(0)
+Function call 11 O.foo()
+Function call 3 a.foo("")
+Function call 7 x.foo(0)
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.results.txt
index d82ebc4e61a..e52980ff7e0 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.results.txt
@@ -1 +1 @@
-Function call (8: 33) open fun processRequest() = doProcessRequest()
\ No newline at end of file
+Function call 8 open fun processRequest() = doProcessRequest()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt
index eaccce829fd..0b7e320aa0c 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt
@@ -1,5 +1,5 @@
-[kotlinTopLevelMethodUsages.1.kt] Callable reference (6: 23) val methodRef = ::processRequest()
-[kotlinTopLevelMethodUsages.1.kt] Function call (10: 9) processRequest()
-[kotlinTopLevelMethodUsages.1.kt] Usage in import (3: 15) import server.processRequest
-[kotlinTopLevelMethodUsages.2.java] Unclassified usage (6: 47) String s = KotlinTopLevelMethodUsages_0Kt.processRequest();
-[kotlinTopLevelMethodUsages.2.java] Unclassified usage (9: 47) return KotlinTopLevelMethodUsages_0Kt.processRequest();
\ No newline at end of file
+[kotlinTopLevelMethodUsages.1.kt] Callable reference 6 val methodRef = ::processRequest()
+[kotlinTopLevelMethodUsages.1.kt] Function call 10 processRequest()
+[kotlinTopLevelMethodUsages.1.kt] Usage in import 3 import server.processRequest
+[kotlinTopLevelMethodUsages.2.java] Unclassified usage 6 String s = KotlinTopLevelMethodUsages_0Kt.processRequest();
+[kotlinTopLevelMethodUsages.2.java] Unclassified usage 9 return KotlinTopLevelMethodUsages_0Kt.processRequest();
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.results.txt
index a634df2c7d0..2aaa04ce33d 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (6: 33) String s = RequestProcessor.processRequest();
-Unclassified usage (9: 33) return RequestProcessor.processRequest();
+Unclassified usage 6 String s = RequestProcessor.processRequest();
+Unclassified usage 9 return RequestProcessor.processRequest();
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.results.txt
index f5e49f9db0a..43ff3801421 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.results.txt
@@ -1,2 +1,2 @@
-Callable reference (6: 23) val methodRef = ::processRequest()
-Function call (10: 9) processRequest()
\ No newline at end of file
+Callable reference 6 val methodRef = ::processRequest()
+Function call 10 processRequest()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.results.txt
index a634df2c7d0..2aaa04ce33d 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (6: 33) String s = RequestProcessor.processRequest();
-Unclassified usage (9: 33) return RequestProcessor.processRequest();
+Unclassified usage 6 String s = RequestProcessor.processRequest();
+Unclassified usage 9 return RequestProcessor.processRequest();
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
index 5f8e4c1fecc..9c77d572ee6 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
@@ -1,2 +1,2 @@
-[kotlinTraitImplThroughDelegate.0.kt] Function call (11: 53) fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
-[kotlinTraitImplThroughDelegate.1.java] Unclassified usage (7: 14) some.foo();
\ No newline at end of file
+[kotlinTraitImplThroughDelegate.0.kt] Function call 11 fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
+[kotlinTraitImplThroughDelegate.1.java] Unclassified usage 7 some.foo();
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt
index 9ae5d59c603..00135113003 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt
@@ -1,2 +1,2 @@
-[kotlinTraitNoImplThroughDelegate.0.kt] Function call (11: 51) fun test(twdni: TraitWithDelegatedNoImpl) = twdni.foo()
-[kotlinTraitNoImplThroughDelegate.1.java] Unclassified usage (7: 14) some.foo();
\ No newline at end of file
+[kotlinTraitNoImplThroughDelegate.0.kt] Function call 11 fun test(twdni: TraitWithDelegatedNoImpl) = twdni.foo()
+[kotlinTraitNoImplThroughDelegate.1.java] Unclassified usage 7 some.foo();
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.results.txt
index 8bce9f71188..6ad941c7f7d 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.results.txt
@@ -1 +1 @@
-Function call (11: 18) LocalClass().f()
\ No newline at end of file
+Function call 11 LocalClass().f()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.results.txt
index afa35e6d7c3..267a51de14c 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.results.txt
@@ -1 +1 @@
-Value read (14: 11) a.b.c.d
\ No newline at end of file
+Value read 14 a.b.c.d
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.results.txt
index 82353d58d0a..f85574d82a1 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.results.txt
@@ -1 +1 @@
-Function call (11: 17) localObject.f()
\ No newline at end of file
+Function call 11 localObject.f()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.results.txt
index 49fe2eb71c8..850f2bed9f0 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.results.txt
@@ -1 +1 @@
-Function call (11: 19) localObject().f()
+Function call 11 localObject().f()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.results.txt
index f54c371735d..9ebf98c0309 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.results.txt
@@ -1 +1 @@
-Function call (10: 21) localObject.f()
\ No newline at end of file
+Function call 10 localObject.f()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.results.txt
index 81e9b32735d..da0c3cd64d2 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.results.txt
@@ -1 +1 @@
-Function call (12: 10) B(0).copy(1)
+Function call 12 B(0).copy(1)
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.results.txt
index c2c40ddc210..379e6946133 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.results.txt
@@ -1 +1 @@
-Function call (13: 7) a.foo()
\ No newline at end of file
+Function call 13 a.foo()
diff --git a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.results.txt b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.results.txt
index 8403305c7f0..b22d28a8cb8 100644
--- a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.results.txt
+++ b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.results.txt
@@ -1,16 +1,16 @@
-[javaPropertyUsagesK.0.kt] Value read (16: 17) val t = A().p
-[javaPropertyUsagesK.0.kt] Value read (19: 18) val t = AA().p
-[javaPropertyUsagesK.0.kt] Value read (22: 17) val t = J().p
-[javaPropertyUsagesK.0.kt] Value read (25: 17) val t = B().p
-[javaPropertyUsagesK.0.kt] Value write (17: 9) A().p = 1
-[javaPropertyUsagesK.0.kt] Value write (20: 10) AA().p = 1
-[javaPropertyUsagesK.0.kt] Value write (23: 9) J().p = 1
-[javaPropertyUsagesK.0.kt] Value write (26: 9) B().p = 1
-[javaPropertyUsagesK.1.java] Unclassified usage (15: 17) new A().getP();
-[javaPropertyUsagesK.1.java] Unclassified usage (16: 17) new A().setP(1);
-[javaPropertyUsagesK.1.java] Unclassified usage (18: 18) new AA().getP();
-[javaPropertyUsagesK.1.java] Unclassified usage (19: 18) new AA().setP(1);
-[javaPropertyUsagesK.1.java] Unclassified usage (21: 17) new J().getP();
-[javaPropertyUsagesK.1.java] Unclassified usage (22: 17) new J().setP(1);
-[javaPropertyUsagesK.1.java] Unclassified usage (24: 17) new B().getP();
-[javaPropertyUsagesK.1.java] Unclassified usage (25: 17) new B().setP(1);
\ No newline at end of file
+[javaPropertyUsagesK.0.kt] Value read 16 val t = A().p
+[javaPropertyUsagesK.0.kt] Value read 19 val t = AA().p
+[javaPropertyUsagesK.0.kt] Value read 22 val t = J().p
+[javaPropertyUsagesK.0.kt] Value read 25 val t = B().p
+[javaPropertyUsagesK.0.kt] Value write 17 A().p = 1
+[javaPropertyUsagesK.0.kt] Value write 20 AA().p = 1
+[javaPropertyUsagesK.0.kt] Value write 23 J().p = 1
+[javaPropertyUsagesK.0.kt] Value write 26 B().p = 1
+[javaPropertyUsagesK.1.java] Unclassified usage 15 new A().getP();
+[javaPropertyUsagesK.1.java] Unclassified usage 16 new A().setP(1);
+[javaPropertyUsagesK.1.java] Unclassified usage 18 new AA().getP();
+[javaPropertyUsagesK.1.java] Unclassified usage 19 new AA().setP(1);
+[javaPropertyUsagesK.1.java] Unclassified usage 21 new J().getP();
+[javaPropertyUsagesK.1.java] Unclassified usage 22 new J().setP(1);
+[javaPropertyUsagesK.1.java] Unclassified usage 24 new B().getP();
+[javaPropertyUsagesK.1.java] Unclassified usage 25 new B().setP(1);
diff --git a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.results.txt b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.results.txt
index 01d08a53cce..60d3af361b4 100644
--- a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.results.txt
+++ b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.results.txt
@@ -1,4 +1,4 @@
-[javaPropertyUsagesKJK.0.kt] Value read (25: 17) val t = B().p
-[javaPropertyUsagesKJK.0.kt] Value write (26: 9) B().p = 1
-[javaPropertyUsagesKJK.1.java] Unclassified usage (24: 17) new B().getP();
-[javaPropertyUsagesKJK.1.java] Unclassified usage (25: 17) new B().setP(1);
\ No newline at end of file
+[javaPropertyUsagesKJK.0.kt] Value read 25 val t = B().p
+[javaPropertyUsagesKJK.0.kt] Value write 26 B().p = 1
+[javaPropertyUsagesKJK.1.java] Unclassified usage 24 new B().getP();
+[javaPropertyUsagesKJK.1.java] Unclassified usage 25 new B().setP(1);
diff --git a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.results.txt b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.results.txt
index 80623f7d0ae..16cbc133659 100644
--- a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.results.txt
+++ b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.results.txt
@@ -1,4 +1,4 @@
-[javaPropertyUsagesKK.0.kt] Value read (19: 18) val t = AA().p
-[javaPropertyUsagesKK.0.kt] Value write (20: 10) AA().p = 1
-[javaPropertyUsagesKK.1.java] Unclassified usage (18: 18) new AA().getP();
-[javaPropertyUsagesKK.1.java] Unclassified usage (19: 18) new AA().setP(1);
\ No newline at end of file
+[javaPropertyUsagesKK.0.kt] Value read 19 val t = AA().p
+[javaPropertyUsagesKK.0.kt] Value write 20 AA().p = 1
+[javaPropertyUsagesKK.1.java] Unclassified usage 18 new AA().getP();
+[javaPropertyUsagesKK.1.java] Unclassified usage 19 new AA().setP(1);
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
index 0fc7f02e4c5..d9869ae083f 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
@@ -1,2 +1,2 @@
-Class static member access (7: 39) System.out.println("foo = " + O.INSTANCE.getFoo());
-Usage in import (3: 15) import server.O;
\ No newline at end of file
+Class static member access 7 System.out.println("foo = " + O.INSTANCE.getFoo());
+Usage in import 3 import server.O;
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.results.txt
index 88078951fb2..6cf46b74dc1 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.results.txt
@@ -1 +1 @@
-Value read (6: 12) return Bar
\ No newline at end of file
+Value read 6 return Bar
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.results.txt
index 478b5b223d9..4c1da4283d0 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.results.txt
@@ -1 +1 @@
-Value read (7: 16) return Bar
\ No newline at end of file
+Value read 7 return Bar
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.results.txt
index 87a7ce5d980..0aa28108775 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.results.txt
@@ -1,3 +1,3 @@
-Receiver (10: 28) println("foo = ${a.O.foo}")
-Usage in import (3: 12) import a.A.O
-Value read (11: 21) val obj = a.O
+Receiver 10 println("foo = ${a.O.foo}")
+Usage in import 3 import a.A.O
+Value read 11 val obj = a.O
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.results.txt
index db7207b9ba8..98c225d6970 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.results.txt
@@ -1,3 +1,3 @@
-Receiver (7: 26) println("foo = ${O.foo}")
-Usage in import (3: 15) import server.O
-Value read (8: 19) val obj = O
+Receiver 7 println("foo = ${O.foo}")
+Usage in import 3 import server.O
+Value read 8 val obj = O
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.results.txt
index c847dd84084..d6541bcc41d 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.results.txt
@@ -1 +1 @@
-Value read (10: 33) open fun processRequest() = Foo
+Value read 10 open fun processRequest() = Foo
diff --git a/idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.results.txt b/idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.results.txt
index 94176e58b23..0e267a32656 100644
--- a/idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.results.txt
@@ -1,4 +1,4 @@
-Class/object property type (10: 8) val x: foo.bar.X? = foo.bar.X()
-Package directive (4: 9) package foo.bar
-Package member access (10: 21) val x: foo.bar.X? = foo.bar.X()
-Usage in import (6: 8) import foo.bar.X
+Class/object property type 10 val x: foo.bar.X? = foo.bar.X()
+Package directive 4 package foo.bar
+Package member access 10 val x: foo.bar.X? = foo.bar.X()
+Usage in import 6 import foo.bar.X
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.results.txt
index 3a2c991b116..88b89f158c2 100644
--- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.results.txt
@@ -1 +1 @@
-Unclassified usage (5: 26) return dataClass.component1();
+Unclassified usage 5 return dataClass.component1();
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.results.txt
index b7a71509e7f..036df139ce4 100644
--- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.results.txt
@@ -1,4 +1,4 @@
-Named argument (11: 18) return A(foo = ":)")
-Named argument (16: 7) A(foo = ":)")
-Value read (5: 17) println(foo)
-Value read (8: 16) val t: T = foo
+Named argument 11 return A(foo = ":)")
+Named argument 16 A(foo = ":)")
+Value read 5 println(foo)
+Value read 8 val t: T = foo
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt
index 7301bbdbeee..abc73f7bdfb 100644
--- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt
@@ -1,3 +1,3 @@
-Named argument (13: 9) foo(t = ":)")
-Value read (4: 13) println(t)
-Value read (5: 12) return t
\ No newline at end of file
+Named argument 13 foo(t = ":)")
+Value read 4 println(t)
+Value read 5 return t
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinHighlightParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinHighlightParameterUsages.results.txt
index 7f451019e42..8a4677c937b 100644
--- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinHighlightParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinHighlightParameterUsages.results.txt
@@ -1 +1 @@
-Value read (9: 17) println(foo) // not highlighted `foo`
+Value read 9 println(foo) // not highlighted `foo`
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.results.txt b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.results.txt
index 6efc67fb10a..bd40572819b 100644
--- a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.results.txt
+++ b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.results.txt
@@ -1,4 +1,4 @@
-New instance creation (11: 13) new A(1, 1.0);
-New instance creation (15: 13) new A(1, 1.0, "1");
-New instance creation (3: 13) new A();
-New instance creation (7: 13) new A(1);
\ No newline at end of file
+New instance creation 11 new A(1, 1.0);
+New instance creation 15 new A(1, 1.0, "1");
+New instance creation 3 new A();
+New instance creation 7 new A(1);
diff --git a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.results.txt b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.results.txt
index 526995a8283..2451f940e3d 100644
--- a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.results.txt
+++ b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.results.txt
@@ -1,4 +1,4 @@
-New instance creation (16: 5) A(1)
-Supertype (12: 12) class C(): A(1)
-Unclassified usage (5: 20) constructor(): this(1)
-Unclassified usage (9: 26) constructor(n: Int): super(n)
\ No newline at end of file
+New instance creation 16 A(1)
+Supertype 12 class C(): A(1)
+Unclassified usage 5 constructor(): this(1)
+Unclassified usage 9 constructor(n: Int): super(n)
diff --git a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.results.txt b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.results.txt
index ea2175d571f..426cb9250f4 100644
--- a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.results.txt
+++ b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.results.txt
@@ -1,4 +1,4 @@
-New instance creation (15: 5) A(1)
-Supertype (11: 12) class C(): A(1)
-Unclassified usage (4: 20) constructor(): this(1)
-Unclassified usage (8: 26) constructor(n: Int): super(n)
\ No newline at end of file
+New instance creation 15 A(1)
+Supertype 11 class C(): A(1)
+Unclassified usage 4 constructor(): this(1)
+Unclassified usage 8 constructor(n: Int): super(n)
diff --git a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.results.txt b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.results.txt
index ea2175d571f..426cb9250f4 100644
--- a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.results.txt
+++ b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.results.txt
@@ -1,4 +1,4 @@
-New instance creation (15: 5) A(1)
-Supertype (11: 12) class C(): A(1)
-Unclassified usage (4: 20) constructor(): this(1)
-Unclassified usage (8: 26) constructor(n: Int): super(n)
\ No newline at end of file
+New instance creation 15 A(1)
+Supertype 11 class C(): A(1)
+Unclassified usage 4 constructor(): this(1)
+Unclassified usage 8 constructor(n: Int): super(n)
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt
index 08e43f8055f..ae3a5298cc2 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt
@@ -1,4 +1,4 @@
-[javaAndKotlinOverrides.0.kt] Unclassified usage (25: 18) override var foo: String = ""
-[javaAndKotlinOverrides.0.kt] Unclassified usage (8: 18) override var foo: String
-[javaAndKotlinOverrides.1.java] Unclassified usage (12: 17) public void setFoo(String s) {
-[javaAndKotlinOverrides.1.java] Unclassified usage (7: 19) public String getFoo() {
\ No newline at end of file
+[javaAndKotlinOverrides.0.kt] Unclassified usage 25 override var foo: String = ""
+[javaAndKotlinOverrides.0.kt] Unclassified usage 8 override var foo: String
+[javaAndKotlinOverrides.1.java] Unclassified usage 12 public void setFoo(String s) {
+[javaAndKotlinOverrides.1.java] Unclassified usage 7 public String getFoo() {
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.results.txt
index c0b4bafa005..afb6469987e 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.results.txt
@@ -1,5 +1,5 @@
-[javaAndKotlinOverrides2.0.kt] Unclassified usage (23: 18) override var foo: String = ""
-[javaAndKotlinOverrides2.0.kt] Unclassified usage (26: 30) open class E<T>(override var foo: T): A<T>(foo)
-[javaAndKotlinOverrides2.0.kt] Unclassified usage (6: 18) override var foo: String
-[javaAndKotlinOverrides2.1.java] Unclassified usage (12: 17) public void setFoo(String s) {
-[javaAndKotlinOverrides2.1.java] Unclassified usage (7: 19) public String getFoo() {
\ No newline at end of file
+[javaAndKotlinOverrides2.0.kt] Unclassified usage 23 override var foo: String = ""
+[javaAndKotlinOverrides2.0.kt] Unclassified usage 26 open class E<T>(override var foo: T): A<T>(foo)
+[javaAndKotlinOverrides2.0.kt] Unclassified usage 6 override var foo: String
+[javaAndKotlinOverrides2.1.java] Unclassified usage 12 public void setFoo(String s) {
+[javaAndKotlinOverrides2.1.java] Unclassified usage 7 public String getFoo() {
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt
index f0574a4e93e..8d3ff8c5224 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage (10: 43) System.out.println("a.foo = " + A.foo);
-Unclassified usage (7: 21) A.Companion.setFoo("a");
-Unclassified usage (8: 11) A.foo = "a";
-Unclassified usage (9: 53) System.out.println("a.foo = " + A.Companion.getFoo());
\ No newline at end of file
+Unclassified usage 10 System.out.println("a.foo = " + A.foo);
+Unclassified usage 7 A.Companion.setFoo("a");
+Unclassified usage 8 A.foo = "a";
+Unclassified usage 9 System.out.println("a.foo = " + A.Companion.getFoo());
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.results.txt
index 8a8852e3d66..1c963d710e0 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (13: 43) System.out.println("b.foo = " + b.getFoo());
-Unclassified usage (9: 43) System.out.println("a.foo = " + a.getFoo());
\ No newline at end of file
+Unclassified usage 13 System.out.println("b.foo = " + b.getFoo());
+Unclassified usage 9 System.out.println("a.foo = " + a.getFoo());
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.results.txt
index 8a8852e3d66..1c963d710e0 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (13: 43) System.out.println("b.foo = " + b.getFoo());
-Unclassified usage (9: 43) System.out.println("a.foo = " + a.getFoo());
\ No newline at end of file
+Unclassified usage 13 System.out.println("b.foo = " + b.getFoo());
+Unclassified usage 9 System.out.println("a.foo = " + a.getFoo());
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.results.txt
index 7d13c5e1a71..751eddd7d80 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage (12: 11) b.setFoo("b");
-Unclassified usage (13: 43) System.out.println("b.foo = " + b.getFoo());
-Unclassified usage (8: 11) a.setFoo("a");
-Unclassified usage (9: 43) System.out.println("a.foo = " + a.getFoo());
\ No newline at end of file
+Unclassified usage 12 b.setFoo("b");
+Unclassified usage 13 System.out.println("b.foo = " + b.getFoo());
+Unclassified usage 8 a.setFoo("a");
+Unclassified usage 9 System.out.println("a.foo = " + a.getFoo());
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.results.txt
index 7d13c5e1a71..751eddd7d80 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage (12: 11) b.setFoo("b");
-Unclassified usage (13: 43) System.out.println("b.foo = " + b.getFoo());
-Unclassified usage (8: 11) a.setFoo("a");
-Unclassified usage (9: 43) System.out.println("a.foo = " + a.getFoo());
\ No newline at end of file
+Unclassified usage 12 b.setFoo("b");
+Unclassified usage 13 System.out.println("b.foo = " + b.getFoo());
+Unclassified usage 8 a.setFoo("a");
+Unclassified usage 9 System.out.println("a.foo = " + a.getFoo());
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.results.txt
index 98bd4c92281..2e361074887 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (12: 11) b.setFoo("b");
-Unclassified usage (8: 11) a.setFoo("a");
+Unclassified usage 12 b.setFoo("b");
+Unclassified usage 8 a.setFoo("a");
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.results.txt
index 98bd4c92281..2e361074887 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (12: 11) b.setFoo("b");
-Unclassified usage (8: 11) a.setFoo("a");
+Unclassified usage 12 b.setFoo("b");
+Unclassified usage 8 a.setFoo("a");
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.results.txt
index 04071ca0fad..d0a8893b4a1 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.results.txt
@@ -1,2 +1,2 @@
-[kotlinClassObjectPropertyUsage.0.kt] Value read (11: 14) val a = Some.XX
-[kotlinClassObjectPropertyUsage.1.java] Unclassified usage (7: 22) int i = Some.XX;
\ No newline at end of file
+[kotlinClassObjectPropertyUsage.0.kt] Value read 11 val a = Some.XX
+[kotlinClassObjectPropertyUsage.1.java] Unclassified usage 7 int i = Some.XX;
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.results.txt
index d8919533402..4eadbaf9102 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.results.txt
@@ -1 +1 @@
-Value read (6: 12) return bar
+Value read 6 return bar
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.results.txt
index a6e139e9408..2a38aee1fc2 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.results.txt
@@ -1 +1 @@
-Value read (7: 16) return bar
+Value read 7 return bar
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.results.txt
index a5e2729e692..f1c07777d29 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.results.txt
@@ -1,2 +1,2 @@
-Usage in import (5: 15) import server.foo
-Value read (9: 21) val t = 1.foo + foo
+Usage in import 5 import server.foo
+Value read 9 val t = 1.foo + foo
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.results.txt
index c1b47f6f4e7..6b9c17e55f0 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage (7: 35) int n = new Outer.Inner().getFoo();
-Unclassified usage (8: 27) new Outer.Inner().setFoo(2);
+Unclassified usage 7 int n = new Outer.Inner().getFoo();
+Unclassified usage 8 new Outer.Inner().setFoo(2);
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.results.txt
index f62cc239193..179a24f90d2 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.results.txt
@@ -1 +1 @@
-Value read (4: 19) val x = Outer.t
\ No newline at end of file
+Value read 4 val x = Outer.t
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.results.txt
index 6bb69c96e62..b0943c212ed 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.results.txt
@@ -1 +1 @@
-Value read (8: 33) open fun processRequest() = foo
+Value read 8 open fun processRequest() = foo
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt
index 8ddf68005f4..6257575f49d 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt
@@ -1,3 +1,3 @@
-[kotlinPrivatePropertyUsages2.0.kt] Named argument (9: 33) public class ServerEx(): Server(foo = "!") {
-[kotlinPrivatePropertyUsages2.0.kt] Value read (6: 33) open fun processRequest() = foo
-[kotlinPrivatePropertyUsages2.1.kt] Named argument (5: 24) println(Server(foo = "!").foo)
\ No newline at end of file
+[kotlinPrivatePropertyUsages2.0.kt] Named argument 9 public class ServerEx(): Server(foo = "!") {
+[kotlinPrivatePropertyUsages2.0.kt] Value read 6 open fun processRequest() = foo
+[kotlinPrivatePropertyUsages2.1.kt] Named argument 5 println(Server(foo = "!").foo)
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt
index a7a80e91eb6..0ed531fe69b 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt
@@ -1,3 +1,3 @@
-[kotlinPropertyReadUsages.0.kt] Value read (13: 29) return super<A>.foo
-[kotlinPropertyReadUsages.1.kt] Value read (11: 30) println("b.foo = ${b.foo}")
-[kotlinPropertyReadUsages.1.kt] Value read (7: 30) println("a.foo = ${a.foo}")
\ No newline at end of file
+[kotlinPropertyReadUsages.0.kt] Value read 13 return super<A>.foo
+[kotlinPropertyReadUsages.1.kt] Value read 11 println("b.foo = ${b.foo}")
+[kotlinPropertyReadUsages.1.kt] Value read 7 println("a.foo = ${a.foo}")
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt
index 90bac11db80..2c5adfee983 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt
@@ -1,3 +1,3 @@
-[kotlinPropertyReadUsages2.0.kt] Value read (11: 29) return super<A>.foo
-[kotlinPropertyReadUsages2.1.kt] Value read (11: 30) println("b.foo = ${b.foo}")
-[kotlinPropertyReadUsages2.1.kt] Value read (7: 30) println("a.foo = ${a.foo}")
\ No newline at end of file
+[kotlinPropertyReadUsages2.0.kt] Value read 11 return super<A>.foo
+[kotlinPropertyReadUsages2.1.kt] Value read 11 println("b.foo = ${b.foo}")
+[kotlinPropertyReadUsages2.1.kt] Value read 7 println("a.foo = ${a.foo}")
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt
index 00f20a951ef..6cfee77e94a 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt
@@ -1,6 +1,6 @@
-[kotlinPropertyUsages.0.kt] Value read (13: 29) return super<A>.foo
-[kotlinPropertyUsages.0.kt] Value write (17: 22) super<A>.foo = value
-[kotlinPropertyUsages.1.kt] Value read (11: 30) println("b.foo = ${b.foo}")
-[kotlinPropertyUsages.1.kt] Value read (7: 30) println("a.foo = ${a.foo}")
-[kotlinPropertyUsages.1.kt] Value write (10: 11) b.foo = "b"
-[kotlinPropertyUsages.1.kt] Value write (6: 11) a.foo = "a"
\ No newline at end of file
+[kotlinPropertyUsages.0.kt] Value read 13 return super<A>.foo
+[kotlinPropertyUsages.0.kt] Value write 17 super<A>.foo = value
+[kotlinPropertyUsages.1.kt] Value read 11 println("b.foo = ${b.foo}")
+[kotlinPropertyUsages.1.kt] Value read 7 println("a.foo = ${a.foo}")
+[kotlinPropertyUsages.1.kt] Value write 10 b.foo = "b"
+[kotlinPropertyUsages.1.kt] Value write 6 a.foo = "a"
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt
index 9ffb6e1b1b6..05c937fb6d5 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt
@@ -1,6 +1,6 @@
-[kotlinPropertyUsages2.0.kt] Value read (11: 29) return super<A>.foo
-[kotlinPropertyUsages2.0.kt] Value write (15: 22) super<A>.foo = value
-[kotlinPropertyUsages2.1.kt] Value read (11: 30) println("b.foo = ${b.foo}")
-[kotlinPropertyUsages2.1.kt] Value read (7: 30) println("a.foo = ${a.foo}")
-[kotlinPropertyUsages2.1.kt] Value write (10: 11) b.foo = "b"
-[kotlinPropertyUsages2.1.kt] Value write (6: 11) a.foo = "a"
\ No newline at end of file
+[kotlinPropertyUsages2.0.kt] Value read 11 return super<A>.foo
+[kotlinPropertyUsages2.0.kt] Value write 15 super<A>.foo = value
+[kotlinPropertyUsages2.1.kt] Value read 11 println("b.foo = ${b.foo}")
+[kotlinPropertyUsages2.1.kt] Value read 7 println("a.foo = ${a.foo}")
+[kotlinPropertyUsages2.1.kt] Value write 10 b.foo = "b"
+[kotlinPropertyUsages2.1.kt] Value write 6 a.foo = "a"
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt
index ef7cd7d3cce..90a830f663c 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt
@@ -1,3 +1,3 @@
-[kotlinPropertyWriteUsages.0.kt] Value write (17: 22) super<A>.foo = value
-[kotlinPropertyWriteUsages.1.kt] Value write (10: 11) b.foo = "b"
-[kotlinPropertyWriteUsages.1.kt] Value write (6: 11) a.foo = "a"
\ No newline at end of file
+[kotlinPropertyWriteUsages.0.kt] Value write 17 super<A>.foo = value
+[kotlinPropertyWriteUsages.1.kt] Value write 10 b.foo = "b"
+[kotlinPropertyWriteUsages.1.kt] Value write 6 a.foo = "a"
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt
index d9da3a3096e..174802c6e7a 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt
@@ -1,3 +1,3 @@
-[kotlinPropertyWriteUsages2.0.kt] Value write (15: 22) super<A>.foo = value
-[kotlinPropertyWriteUsages2.1.kt] Value write (10: 11) b.foo = "b"
-[kotlinPropertyWriteUsages2.1.kt] Value write (6: 11) a.foo = "a"
\ No newline at end of file
+[kotlinPropertyWriteUsages2.0.kt] Value write 15 super<A>.foo = value
+[kotlinPropertyWriteUsages2.1.kt] Value write 10 b.foo = "b"
+[kotlinPropertyWriteUsages2.1.kt] Value write 6 a.foo = "a"
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt
index ddcad3e3491..8ee0a25fb7b 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt
@@ -1,6 +1,6 @@
-[kotlinTopLevelPropertyUsages.1.kt] Receiver (8: 35) println("length: ${server.foo.length()}")
-[kotlinTopLevelPropertyUsages.1.kt] Usage in import (3: 15) import server.foo
-[kotlinTopLevelPropertyUsages.1.kt] Value read (7: 33) println("foo = ${server.foo}")
-[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (7: 72) System.out.println("foo = " + KotlinTopLevelPropertyUsages_0Kt.getFoo());
-[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (8: 74) System.out.println("length: " + KotlinTopLevelPropertyUsages_0Kt.getFoo().length());
-[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (9: 42) KotlinTopLevelPropertyUsages_0Kt.setFoo("");
\ No newline at end of file
+[kotlinTopLevelPropertyUsages.1.kt] Receiver 8 println("length: ${server.foo.length()}")
+[kotlinTopLevelPropertyUsages.1.kt] Usage in import 3 import server.foo
+[kotlinTopLevelPropertyUsages.1.kt] Value read 7 println("foo = ${server.foo}")
+[kotlinTopLevelPropertyUsages.2.java] Unclassified usage 7 System.out.println("foo = " + KotlinTopLevelPropertyUsages_0Kt.getFoo());
+[kotlinTopLevelPropertyUsages.2.java] Unclassified usage 8 System.out.println("length: " + KotlinTopLevelPropertyUsages_0Kt.getFoo().length());
+[kotlinTopLevelPropertyUsages.2.java] Unclassified usage 9 KotlinTopLevelPropertyUsages_0Kt.setFoo("");
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kt7656.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kt7656.results.txt
index 46482eab310..abd18320f2d 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kt7656.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kt7656.results.txt
@@ -1 +1 @@
-Unclassified usage (10: 15) println(a.field)
+Unclassified usage 10 println(a.field)
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.results.txt b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.results.txt
index b9aae4fbfc9..eb03e149818 100644
--- a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.results.txt
+++ b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.results.txt
@@ -1,8 +1,8 @@
-[defaultSecondaryConstructor.0.kt] New instance creation (28: 5) B()
-[defaultSecondaryConstructor.0.kt] Supertype (23: 11) class C : B() {
-[defaultSecondaryConstructor.0.kt] Unclassified usage (14: 27) constructor(a: Int) : super() {
-[defaultSecondaryConstructor.0.kt] Unclassified usage (18: 19) constructor() {
-[defaultSecondaryConstructor.0.kt] Unclassified usage (8: 26) constructor(a: Int): this() {
-[defaultSecondaryConstructor.1.java] New instance creation (11: 13) new B();
-[defaultSecondaryConstructor.1.java] Unclassified usage (3: 9) super();
-[defaultSecondaryConstructor.1.java] Unclassified usage (6: 12) public J() {
\ No newline at end of file
+[defaultSecondaryConstructor.0.kt] New instance creation 28 B()
+[defaultSecondaryConstructor.0.kt] Supertype 23 class C : B() {
+[defaultSecondaryConstructor.0.kt] Unclassified usage 14 constructor(a: Int) : super() {
+[defaultSecondaryConstructor.0.kt] Unclassified usage 18 constructor() {
+[defaultSecondaryConstructor.0.kt] Unclassified usage 8 constructor(a: Int): this() {
+[defaultSecondaryConstructor.1.java] New instance creation 11 new B();
+[defaultSecondaryConstructor.1.java] Unclassified usage 3 super();
+[defaultSecondaryConstructor.1.java] Unclassified usage 6 public J() {
diff --git a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.results.txt b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.results.txt
index 6efc67fb10a..bd40572819b 100644
--- a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.results.txt
+++ b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.results.txt
@@ -1,4 +1,4 @@
-New instance creation (11: 13) new A(1, 1.0);
-New instance creation (15: 13) new A(1, 1.0, "1");
-New instance creation (3: 13) new A();
-New instance creation (7: 13) new A(1);
\ No newline at end of file
+New instance creation 11 new A(1, 1.0);
+New instance creation 15 new A(1, 1.0, "1");
+New instance creation 3 new A();
+New instance creation 7 new A(1);
diff --git a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.results.txt b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.results.txt
index ee02b8272ac..70275ab798b 100644
--- a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.results.txt
+++ b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.results.txt
@@ -1,6 +1,6 @@
-[secondaryConstructor.0.kt] New instance creation (24: 5) B("")
-[secondaryConstructor.0.kt] Supertype (19: 10) class C: B("") {
-[secondaryConstructor.0.kt] Unclassified usage (14: 27) constructor(a: Int) : super("") {
-[secondaryConstructor.0.kt] Unclassified usage (4: 20) constructor(): this("") {
-[secondaryConstructor.1.java] New instance creation (7: 13) new B("");
-[secondaryConstructor.1.java] Unclassified usage (3: 9) super("");
\ No newline at end of file
+[secondaryConstructor.0.kt] New instance creation 24 B("")
+[secondaryConstructor.0.kt] Supertype 19 class C: B("") {
+[secondaryConstructor.0.kt] Unclassified usage 14 constructor(a: Int) : super("") {
+[secondaryConstructor.0.kt] Unclassified usage 4 constructor(): this("") {
+[secondaryConstructor.1.java] New instance creation 7 new B("");
+[secondaryConstructor.1.java] Unclassified usage 3 super("");
diff --git a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.results.txt
index 4565a4ad784..df414c30c38 100644
--- a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.results.txt
@@ -1,6 +1,6 @@
-Class/object property type (10: 12) val t: T = foo
-Extension receiver type (5: 13) fun T.bar() {}
-Function return types (11: 20) fun bar(t: T): T = t
-Parameter type (11: 16) fun bar(t: T): T = t
-Parameter type (3: 22) open class A<T>(foo: T, list: List<T>) {
-Type parameter (3: 36) open class A<T>(foo: T, list: List<T>) {
+Class/object property type 10 val t: T = foo
+Extension receiver type 5 fun T.bar() {}
+Function return types 11 fun bar(t: T): T = t
+Parameter type 11 fun bar(t: T): T = t
+Parameter type 3 open class A<T>(foo: T, list: List<T>) {
+Type parameter 3 open class A<T>(foo: T, list: List<T>) {
diff --git a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.results.txt
index 2d8663370df..7446bcde8b5 100644
--- a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.results.txt
@@ -1,4 +1,4 @@
-Extension receiver type (3: 9) fun <T> T.foo(t: T, list: List<T>): T {
-Function return types (3: 37) fun <T> T.foo(t: T, list: List<T>): T {
-Parameter type (3: 18) fun <T> T.foo(t: T, list: List<T>): T {
-Type parameter (3: 32) fun <T> T.foo(t: T, list: List<T>): T {
+Extension receiver type 3 fun <T> T.foo(t: T, list: List<T>): T {
+Function return types 3 fun <T> T.foo(t: T, list: List<T>): T {
+Parameter type 3 fun <T> T.foo(t: T, list: List<T>): T {
+Type parameter 3 fun <T> T.foo(t: T, list: List<T>): T {
diff --git a/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.results.txt b/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.results.txt
index 255bbb70e47..1b3d14ac848 100644
--- a/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.results.txt
+++ b/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.results.txt
@@ -1 +1 @@
-New instance creation (5: 9) val a = Test()
+New instance creation 5 val a = Test()
diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt
index 94964d2c894..8d2cd1243d9 100644
--- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt
@@ -1,16 +1,16 @@
-Class/object property type (Client) (6: 21) var nextServer: Server? = new Server()
-Companion object (Client) (5: 29) class Client(name: String = Server.NAME): Server() {
-Companion object (Client) (7: 16) val name = Server.NAME
-Companion object (bar) (32: 28) fun Client.bar(s: Server = Server.NAME) {
-Function return types (Client) (14: 26) fun getNextServer(): Server? {
-Function return types (asServer) (40: 21) fun Any.asServer(): Server? {
-Local variable declaration (Client) (10: 21) val server: Server = s
-Parameter type (Client) (9: 16) fun foo(s: Server) {
-Parameter type (bar) (32: 19) fun Client.bar(s: Server = Server.NAME) {
-Super type qualifier (Client) (19: 15) super<Server>.work()
-Supertype (Client) (23: 23) companion object: Server() {
-Supertype (Client) (5: 43) class Client(name: String = Server.NAME): Server() {
-Supertype (ClientObject) (28: 22) object ClientObject: Server() {
-Target type of 'is' operation (asServer) (41: 24) return if (this is Server) this as Server else null
-Usage in cast target type (asServer) (41: 40) return if (this is Server) this as Server else null
-Usage in import (3: 15) import server.Server
+Class/object property type (Client) 6 var nextServer: Server? = new Server()
+Companion object (Client) 5 class Client(name: String = Server.NAME): Server() {
+Companion object (Client) 7 val name = Server.NAME
+Companion object (bar) 32 fun Client.bar(s: Server = Server.NAME) {
+Function return types (Client) 14 fun getNextServer(): Server? {
+Function return types (asServer) 40 fun Any.asServer(): Server? {
+Local variable declaration (Client) 10 val server: Server = s
+Parameter type (Client) 9 fun foo(s: Server) {
+Parameter type (bar) 32 fun Client.bar(s: Server = Server.NAME) {
+Super type qualifier (Client) 19 super<Server>.work()
+Supertype (Client) 23 companion object: Server() {
+Supertype (Client) 5 class Client(name: String = Server.NAME): Server() {
+Supertype (ClientObject) 28 object ClientObject: Server() {
+Target type of 'is' operation (asServer) 41 return if (this is Server) this as Server else null
+Usage in cast target type (asServer) 41 return if (this is Server) this as Server else null
+Usage in import 3 import server.Server
diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.results.txt
index 2a13adaa78c..84b1a6564d5 100644
--- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.results.txt
@@ -1,2 +1,2 @@
-Function call (Client) (5: 18) Server().processRequest()
-Function call (Client) (6: 20) ServerEx().processRequest()
+Function call (Client) 5 Server().processRequest()
+Function call (Client) 6 ServerEx().processRequest()
diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt
index 0df41fce6c9..225f4fe05c6 100644
--- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt
@@ -1,6 +1,6 @@
-[kotlinPropertyUsages.0.kt] Value read (B) (14: 29) return super<A>.foo
-[kotlinPropertyUsages.0.kt] Value write (B) (18: 22) super<A>.foo = value
-[kotlinPropertyUsages.1.kt] Value read (Client) (11: 30) println("b.foo = ${b.foo}")
-[kotlinPropertyUsages.1.kt] Value read (Client) (7: 30) println("a.foo = ${a.foo}")
-[kotlinPropertyUsages.1.kt] Value write (Client) (10: 11) b.foo = "b"
-[kotlinPropertyUsages.1.kt] Value write (Client) (6: 11) a.foo = "a"
\ No newline at end of file
+[kotlinPropertyUsages.0.kt] Value read (B) 14 return super<A>.foo
+[kotlinPropertyUsages.0.kt] Value write (B) 18 super<A>.foo = value
+[kotlinPropertyUsages.1.kt] Value read (Client) 11 println("b.foo = ${b.foo}")
+[kotlinPropertyUsages.1.kt] Value read (Client) 7 println("a.foo = ${a.foo}")
+[kotlinPropertyUsages.1.kt] Value write (Client) 10 b.foo = "b"
+[kotlinPropertyUsages.1.kt] Value write (Client) 6 a.foo = "a"
diff --git a/idea/testData/findUsages/kotlin/propertyFiles/propertyFileUsagesByRef.results.txt b/idea/testData/findUsages/kotlin/propertyFiles/propertyFileUsagesByRef.results.txt
index 870386fd047..1b5fa5ed0dd 100644
--- a/idea/testData/findUsages/kotlin/propertyFiles/propertyFileUsagesByRef.results.txt
+++ b/idea/testData/findUsages/kotlin/propertyFiles/propertyFileUsagesByRef.results.txt
@@ -1,2 +1,2 @@
-[propertyFileUsagesByRef.0.kt] Usage in string constants (5: 51) public fun message(@PropertyKey(resourceBundle = "idea.testData.findUsages.kotlin.propertyFiles.propertyFileUsagesByRef.2") key: String) = key
-[propertyFileUsagesByRef.1.java] Method parameter declaration (4: 58) static String message(@PropertyKey(resourceBundle = "idea.testData.findUsages.kotlin.propertyFiles.propertyFileUsagesByRef.2") String key, Object... args) {
\ No newline at end of file
+[propertyFileUsagesByRef.0.kt] Usage in string constants 5 public fun message(@PropertyKey(resourceBundle = "idea.testData.findUsages.kotlin.propertyFiles.propertyFileUsagesByRef.2") key: String) = key
+[propertyFileUsagesByRef.1.java] Method parameter declaration 4 static String message(@PropertyKey(resourceBundle = "idea.testData.findUsages.kotlin.propertyFiles.propertyFileUsagesByRef.2") String key, Object... args) {
diff --git a/idea/testData/findUsages/kotlin/propertyFiles/propertyUsagesByRef.results.txt b/idea/testData/findUsages/kotlin/propertyFiles/propertyUsagesByRef.results.txt
index 646f7c8c781..67a0f74a5f6 100644
--- a/idea/testData/findUsages/kotlin/propertyFiles/propertyUsagesByRef.results.txt
+++ b/idea/testData/findUsages/kotlin/propertyFiles/propertyUsagesByRef.results.txt
@@ -1,2 +1,2 @@
-[propertyUsagesByRef.0.kt] Usage in string constants (8: 14) message("foo.bar")
-[propertyUsagesByRef.1.java] Usage in string constants (3: 37) PropertyUsages_1Kt.message("foo.bar");
\ No newline at end of file
+[propertyUsagesByRef.0.kt] Usage in string constants 8 message("foo.bar")
+[propertyUsagesByRef.1.java] Usage in string constants 3 PropertyUsages_1Kt.message("foo.bar");
diff --git a/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.results.txt b/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.results.txt
index 1881962a8c1..6c930f16f5c 100644
--- a/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.results.txt
+++ b/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.results.txt
@@ -1 +1 @@
-Usage in extends/implements clause (1: 29) public class Client extends Foo {}
\ No newline at end of file
+Usage in extends/implements clause 1 public class Client extends Foo {}
diff --git a/idea/testData/findUsages/kotlin/variable/plusAssignFun.results.txt b/idea/testData/findUsages/kotlin/variable/plusAssignFun.results.txt
index 92e10ee064a..9bc5c99e1f7 100644
--- a/idea/testData/findUsages/kotlin/variable/plusAssignFun.results.txt
+++ b/idea/testData/findUsages/kotlin/variable/plusAssignFun.results.txt
@@ -1 +1 @@
-Value read (9: 5) c += 10
\ No newline at end of file
+Value read 9 c += 10
diff --git a/idea/testData/findUsages/kotlin/variable/readAccess.results.txt b/idea/testData/findUsages/kotlin/variable/readAccess.results.txt
index 7ea37e1679d..db23e7e8a7e 100644
--- a/idea/testData/findUsages/kotlin/variable/readAccess.results.txt
+++ b/idea/testData/findUsages/kotlin/variable/readAccess.results.txt
@@ -1,6 +1,6 @@
-Value read (10: 12) print(-v)
-Value read (7: 11) print(v)
-Value write (11: 5) v += 1
-Value write (12: 6) (v) -= 1
-Value write (8: 11) ++ @X v
-Value write (9: 5) v--
\ No newline at end of file
+Value read 10 print(-v)
+Value read 7 print(v)
+Value write 11 v += 1
+Value write 12 (v) -= 1
+Value write 8 ++ @X v
+Value write 9 v--
diff --git a/idea/testData/findUsages/kotlin/variable/writeAccess.results.txt b/idea/testData/findUsages/kotlin/variable/writeAccess.results.txt
index f4abeaff074..c9841b01f8f 100644
--- a/idea/testData/findUsages/kotlin/variable/writeAccess.results.txt
+++ b/idea/testData/findUsages/kotlin/variable/writeAccess.results.txt
@@ -1,5 +1,5 @@
-Value write (11: 5) v += 1
-Value write (12: 6) (v) -= 1
-Value write (6: 9) (@X v) = 2
-Value write (8: 11) ++ @X v
-Value write (9: 5) v--
\ No newline at end of file
+Value write 11 v += 1
+Value write 12 (v) -= 1
+Value write 6 (@X v) = 2
+Value write 8 ++ @X v
+Value write 9 v--
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt
index a0fc5fe0781..6d049d27601 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt
@@ -1,2 +1,2 @@
-Local variable declaration (9: 14) val foo: Foo
-Usage in import (6: 16) import library.Foo
\ No newline at end of file
+Local variable declaration 9 val foo: Foo
+Usage in import 6 import library.Foo
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.results.txt
index 4f212dc2d4e..0babe0fdc73 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.results.txt
@@ -1 +1 @@
-New instance creation (9: 5) Foo(1)
\ No newline at end of file
+New instance creation 9 Foo(1)
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt
index 343f4943d40..211a479f821 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt
@@ -1 +1 @@
-Value write (9: 11) Foo().x = 1
\ No newline at end of file
+Value write 9 Foo().x = 1
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt
index e8a628295e0..646567115b7 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt
@@ -1 +1 @@
-Function call (9: 11) Foo().bar(1)
\ No newline at end of file
+Function call 9 Foo().bar(1)
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt
index 086f8c40ce4..870088b5cf0 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt
@@ -1 +1 @@
-Value write (9: 9) Foo.X = 1
\ No newline at end of file
+Value write 9 Foo.X = 1
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt
index 8ebf107cea2..254d2048b95 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt
@@ -1 +1 @@
-Function call (9: 9) Foo.baz(1)
\ No newline at end of file
+Function call 9 Foo.baz(1)
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt
index c27901a45aa..b45be88d733 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt
@@ -1,24 +1,24 @@
-[LibraryClassUsages.0.kt] Local variable declaration (16: 12) val a: A = A()
-[LibraryClassUsages.0.kt] New instance creation (16: 16) val a: A = A()
-[LibraryClassUsages.0.kt] New instance creation (17: 14) val aa = A(1)
-[LibraryClassUsages.0.kt] Supertype (13: 12) class Y(): A(1)
-[LibraryClassUsages.0.kt] Supertype (9: 10) class X: A {
-[LibraryClassUsages.1.java] Local variable declaration (11: 9) A a = new A();
-[LibraryClassUsages.1.java] Local variable declaration (12: 9) A aa = new A(1);
-[LibraryClassUsages.1.java] New instance creation (11: 19) A a = new A();
-[LibraryClassUsages.1.java] New instance creation (12: 20) A aa = new A(1);
-[LibraryClassUsages.1.java] Usage in extends/implements clause (5: 17) class J extends A {
-[library.kt] Nested class/object (63: 13) val t = A.T(1)
-[library.kt] Nested class/object (64: 14) val tt = A.T()
-[library.kt] New instance creation (57: 13) val a = A(1)
-[library.kt] New instance creation (58: 14) val aa = A()
-[library.kt] Supertype (19: 10) class B: A {
-[library.kt] Supertype (22: 14) class U: A.T {
-[library.kt] Supertype (27: 12) class C(): A(1) {
-[library.kt] Supertype (28: 16) class V(): A.T(1)
-[library.kt] Supertype (31: 11) class BB: A {
-[library.kt] Supertype (34: 15) class UU: A.T {
-[library.kt] Supertype (39: 13) class CC(): A() {
-[library.kt] Supertype (40: 17) class VV(): A.T()
-[library.kt] Unclassified usage (61: 14) val ff = A::foo
-[library.kt] Unclassified usage (66: 15) val fff = A.T::bar
\ No newline at end of file
+[LibraryClassUsages.0.kt] Local variable declaration 16 val a: A = A()
+[LibraryClassUsages.0.kt] New instance creation 16 val a: A = A()
+[LibraryClassUsages.0.kt] New instance creation 17 val aa = A(1)
+[LibraryClassUsages.0.kt] Supertype 13 class Y(): A(1)
+[LibraryClassUsages.0.kt] Supertype 9 class X: A {
+[LibraryClassUsages.1.java] Local variable declaration 11 A a = new A();
+[LibraryClassUsages.1.java] Local variable declaration 12 A aa = new A(1);
+[LibraryClassUsages.1.java] New instance creation 11 A a = new A();
+[LibraryClassUsages.1.java] New instance creation 12 A aa = new A(1);
+[LibraryClassUsages.1.java] Usage in extends/implements clause 5 class J extends A {
+[library.kt] Nested class/object 63 val t = A.T(1)
+[library.kt] Nested class/object 64 val tt = A.T()
+[library.kt] New instance creation 57 val a = A(1)
+[library.kt] New instance creation 58 val aa = A()
+[library.kt] Supertype 19 class B: A {
+[library.kt] Supertype 22 class U: A.T {
+[library.kt] Supertype 27 class C(): A(1) {
+[library.kt] Supertype 28 class V(): A.T(1)
+[library.kt] Supertype 31 class BB: A {
+[library.kt] Supertype 34 class UU: A.T {
+[library.kt] Supertype 39 class CC(): A() {
+[library.kt] Supertype 40 class VV(): A.T()
+[library.kt] Unclassified usage 61 val ff = A::foo
+[library.kt] Unclassified usage 66 val fff = A.T::bar
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt
index e49ece3b8f2..d67258790d4 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt
@@ -1,3 +1,3 @@
-[LibraryCompanionObjectUsages.0.kt] Companion object (10: 15) val a = A.Companion
-[LibraryCompanionObjectUsages.1.java] Local variable declaration (7: 11) A.Companion o = A.Companion;
-[LibraryCompanionObjectUsages.1.java] Unclassified usage (7: 27) A.Companion o = A.Companion;
\ No newline at end of file
+[LibraryCompanionObjectUsages.0.kt] Companion object 10 val a = A.Companion
+[LibraryCompanionObjectUsages.1.java] Local variable declaration 7 A.Companion o = A.Companion;
+[LibraryCompanionObjectUsages.1.java] Unclassified usage 7 A.Companion o = A.Companion;
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.results.txt
index 237ad8beb3c..63ea0a8f243 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.results.txt
@@ -1 +1 @@
-Value read (9: 7) E.ONE
\ No newline at end of file
+Value read 9 E.ONE
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt
index 456aecfd6d3..69046be7fd2 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryFunctionUsages.0.kt] Callable reference (10: 15) val f = ::foo
-[LibraryFunctionUsages.0.kt] Function call (11: 5) foo()
-[library.kt] Callable reference (53: 15) val f = ::foo
-[library.kt] Function call (52: 5) foo()
\ No newline at end of file
+[LibraryFunctionUsages.0.kt] Callable reference 10 val f = ::foo
+[LibraryFunctionUsages.0.kt] Function call 11 foo()
+[library.kt] Callable reference 53 val f = ::foo
+[library.kt] Function call 52 foo()
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt
index 4886eb99dfe..3c97939b94b 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt
@@ -1,5 +1,5 @@
-[LibraryMemberFunctionUsages.0.kt] Callable reference (10: 16) val f = A::foo
-[LibraryMemberFunctionUsages.0.kt] Function call (11: 9) A().foo(1)
-[LibraryMemberFunctionUsages.1.java] Unclassified usage (11: 17) new A().foo(1);
-[library.kt] Callable reference (61: 17) val ff = A::foo
-[library.kt] Function call (60: 7) a.foo(2)
\ No newline at end of file
+[LibraryMemberFunctionUsages.0.kt] Callable reference 10 val f = A::foo
+[LibraryMemberFunctionUsages.0.kt] Function call 11 A().foo(1)
+[LibraryMemberFunctionUsages.1.java] Unclassified usage 11 new A().foo(1);
+[library.kt] Callable reference 61 val ff = A::foo
+[library.kt] Function call 60 a.foo(2)
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt
index 5252e10af7a..cec5ef6ed65 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryNestedClassMemberFunctionUsages.0.kt] Callable reference (10: 18) val f = A.T::bar
-[LibraryNestedClassMemberFunctionUsages.0.kt] Function call (11: 11) A.T().bar(1)
-[library.kt] Callable reference (66: 20) val fff = A.T::bar
-[library.kt] Function call (65: 7) t.bar(2)
\ No newline at end of file
+[LibraryNestedClassMemberFunctionUsages.0.kt] Callable reference 10 val f = A.T::bar
+[LibraryNestedClassMemberFunctionUsages.0.kt] Function call 11 A.T().bar(1)
+[library.kt] Callable reference 66 val fff = A.T::bar
+[library.kt] Function call 65 t.bar(2)
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt
index 3981b4d7a62..5e7d4590040 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryNestedClassPrimaryConstructorUsages.0.kt] New instance creation (17: 16) val aa = A.T(1)
-[LibraryNestedClassPrimaryConstructorUsages.0.kt] Supertype (13: 14) class Y(): A.T(1)
-[library.kt] New instance creation (63: 15) val t = A.T(1)
-[library.kt] Supertype (28: 18) class V(): A.T(1)
\ No newline at end of file
+[LibraryNestedClassPrimaryConstructorUsages.0.kt] New instance creation 17 val aa = A.T(1)
+[LibraryNestedClassPrimaryConstructorUsages.0.kt] Supertype 13 class Y(): A.T(1)
+[library.kt] New instance creation 63 val t = A.T(1)
+[library.kt] Supertype 28 class V(): A.T(1)
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt
index bb05e6ef112..b5be9d81980 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryNestedClassSecondaryConstructorUsages.0.kt] New instance creation (16: 20) val a: A.T = A.T()
-[LibraryNestedClassSecondaryConstructorUsages.0.kt] Supertype (13: 14) class Y(): A.T()
-[library.kt] New instance creation (64: 16) val tt = A.T()
-[library.kt] Supertype (40: 19) class VV(): A.T()
\ No newline at end of file
+[LibraryNestedClassSecondaryConstructorUsages.0.kt] New instance creation 16 val a: A.T = A.T()
+[LibraryNestedClassSecondaryConstructorUsages.0.kt] Supertype 13 class Y(): A.T()
+[library.kt] New instance creation 64 val tt = A.T()
+[library.kt] Supertype 40 class VV(): A.T()
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt
index e7c084aa0ed..02b7f6cc36e 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt
@@ -1,17 +1,17 @@
-[LibraryNestedClassUsages.0.kt] Local variable declaration (16: 14) val a: A.T = A.T()
-[LibraryNestedClassUsages.0.kt] New instance creation (16: 20) val a: A.T = A.T()
-[LibraryNestedClassUsages.0.kt] New instance creation (17: 16) val aa = A.T(1)
-[LibraryNestedClassUsages.0.kt] Supertype (13: 14) class Y(): A.T(1)
-[LibraryNestedClassUsages.0.kt] Supertype (9: 12) class X: A.T {
-[LibraryNestedClassUsages.1.java] Local variable declaration (11: 11) A.T t = new A.T();
-[LibraryNestedClassUsages.1.java] Local variable declaration (12: 11) A.T tt = new A.T(1);
-[LibraryNestedClassUsages.1.java] New instance creation (11: 23) A.T t = new A.T();
-[LibraryNestedClassUsages.1.java] New instance creation (12: 24) A.T tt = new A.T(1);
-[LibraryNestedClassUsages.1.java] Usage in extends/implements clause (5: 19) class J extends A.T {
-[library.kt] New instance creation (63: 15) val t = A.T(1)
-[library.kt] New instance creation (64: 16) val tt = A.T()
-[library.kt] Supertype (22: 16) class U: A.T {
-[library.kt] Supertype (28: 18) class V(): A.T(1)
-[library.kt] Supertype (34: 17) class UU: A.T {
-[library.kt] Supertype (40: 19) class VV(): A.T()
-[library.kt] Unclassified usage (66: 17) val fff = A.T::bar
\ No newline at end of file
+[LibraryNestedClassUsages.0.kt] Local variable declaration 16 val a: A.T = A.T()
+[LibraryNestedClassUsages.0.kt] New instance creation 16 val a: A.T = A.T()
+[LibraryNestedClassUsages.0.kt] New instance creation 17 val aa = A.T(1)
+[LibraryNestedClassUsages.0.kt] Supertype 13 class Y(): A.T(1)
+[LibraryNestedClassUsages.0.kt] Supertype 9 class X: A.T {
+[LibraryNestedClassUsages.1.java] Local variable declaration 11 A.T t = new A.T();
+[LibraryNestedClassUsages.1.java] Local variable declaration 12 A.T tt = new A.T(1);
+[LibraryNestedClassUsages.1.java] New instance creation 11 A.T t = new A.T();
+[LibraryNestedClassUsages.1.java] New instance creation 12 A.T tt = new A.T(1);
+[LibraryNestedClassUsages.1.java] Usage in extends/implements clause 5 class J extends A.T {
+[library.kt] New instance creation 63 val t = A.T(1)
+[library.kt] New instance creation 64 val tt = A.T()
+[library.kt] Supertype 22 class U: A.T {
+[library.kt] Supertype 28 class V(): A.T(1)
+[library.kt] Supertype 34 class UU: A.T {
+[library.kt] Supertype 40 class VV(): A.T()
+[library.kt] Unclassified usage 66 val fff = A.T::bar
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt
index 413d5b3e88f..2993b9bd15a 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryObjectUsages.0.kt] Value read (10: 13) val o = O
-[LibraryObjectUsages.1.java] Class static member access (7: 15) O o = O.INSTANCE;
-[LibraryObjectUsages.1.java] Local variable declaration (7: 9) O o = O.INSTANCE;
-[library.kt] Value read (55: 13) val o = O
\ No newline at end of file
+[LibraryObjectUsages.0.kt] Value read 10 val o = O
+[LibraryObjectUsages.1.java] Class static member access 7 O o = O.INSTANCE;
+[LibraryObjectUsages.1.java] Local variable declaration 7 O o = O.INSTANCE;
+[library.kt] Value read 55 val o = O
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt
index 76221231b87..6dc639a8e47 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryPrimaryConstructorUsages.0.kt] New instance creation (17: 14) val aa = A(1)
-[LibraryPrimaryConstructorUsages.0.kt] Supertype (13: 12) class Y(): A(1)
-[library.kt] New instance creation (57: 13) val a = A(1)
-[library.kt] Supertype (27: 12) class C(): A(1) {
\ No newline at end of file
+[LibraryPrimaryConstructorUsages.0.kt] New instance creation 17 val aa = A(1)
+[LibraryPrimaryConstructorUsages.0.kt] Supertype 13 class Y(): A(1)
+[library.kt] New instance creation 57 val a = A(1)
+[library.kt] Supertype 27 class C(): A(1) {
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt
index 412d373fc63..6b9061b2bfa 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt
@@ -1,4 +1,4 @@
-[LibrarySecondaryConstructorUsages.0.kt] New instance creation (16: 16) val a: A = A()
-[LibrarySecondaryConstructorUsages.0.kt] Supertype (13: 12) class Y(): A()
-[library.kt] New instance creation (58: 14) val aa = A()
-[library.kt] Supertype (39: 13) class CC(): A() {
\ No newline at end of file
+[LibrarySecondaryConstructorUsages.0.kt] New instance creation 16 val a: A = A()
+[LibrarySecondaryConstructorUsages.0.kt] Supertype 13 class Y(): A()
+[library.kt] New instance creation 58 val aa = A()
+[library.kt] Supertype 39 class CC(): A() {
diff --git a/idea/testData/findUsages/propertyFiles/propertyFileUsages.results.txt b/idea/testData/findUsages/propertyFiles/propertyFileUsages.results.txt
index 98cd8cb87c1..db2ad326284 100644
--- a/idea/testData/findUsages/propertyFiles/propertyFileUsages.results.txt
+++ b/idea/testData/findUsages/propertyFiles/propertyFileUsages.results.txt
@@ -1,2 +1,2 @@
-Usage in string constants (3: 28) private val BUNDLE_NAME = "idea.testData.findUsages.propertyFiles.propertyFileUsages.0"
-Usage in string constants (5: 51) public fun message(@PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyFileUsages.0") key: String) = key
\ No newline at end of file
+Usage in string constants 3 private val BUNDLE_NAME = "idea.testData.findUsages.propertyFiles.propertyFileUsages.0"
+Usage in string constants 5 public fun message(@PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyFileUsages.0") key: String) = key
diff --git a/idea/testData/findUsages/propertyFiles/propertyUsages.results.txt b/idea/testData/findUsages/propertyFiles/propertyUsages.results.txt
index b2026e8818b..462052f70d9 100644
--- a/idea/testData/findUsages/propertyFiles/propertyUsages.results.txt
+++ b/idea/testData/findUsages/propertyFiles/propertyUsages.results.txt
@@ -1,10 +1,10 @@
-[propertyUsages.1.kt] Usage in string constants (16: 104) @PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyUsages.0") val s1 = "foo.bar"
-[propertyUsages.1.kt] Usage in string constants (18: 14) message("foo.bar")
-[propertyUsages.1.kt] Usage in string constants (21: 26) "test" infixMessage "foo.bar"
-[propertyUsages.1.kt] Usage in string constants (23: 6) "foo.bar" infixMessage2 "test"
-[propertyUsages.1.kt] Usage in string constants (25: 6) "foo.bar".infixMessage2("test")
-[propertyUsages.1.kt] Usage in string constants (26: 7) -"foo.bar"
-[propertyUsages.1.kt] Usage in string constants (27: 8) 1["foo.bar"]
-[propertyUsages.1.kt] Usage in string constants (28: 6) "foo.bar"["test"]
-[propertyUsages.2.java] Usage in string constants (3: 111) @PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyUsages.0") String s1 = "foo.bar"
-[propertyUsages.2.java] Usage in string constants (5: 37) PropertyUsages_1Kt.message("foo.bar");
\ No newline at end of file
+[propertyUsages.1.kt] Usage in string constants 16 @PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyUsages.0") val s1 = "foo.bar"
+[propertyUsages.1.kt] Usage in string constants 18 message("foo.bar")
+[propertyUsages.1.kt] Usage in string constants 21 "test" infixMessage "foo.bar"
+[propertyUsages.1.kt] Usage in string constants 23 "foo.bar" infixMessage2 "test"
+[propertyUsages.1.kt] Usage in string constants 25 "foo.bar".infixMessage2("test")
+[propertyUsages.1.kt] Usage in string constants 26 -"foo.bar"
+[propertyUsages.1.kt] Usage in string constants 27 1["foo.bar"]
+[propertyUsages.1.kt] Usage in string constants 28 "foo.bar"["test"]
+[propertyUsages.2.java] Usage in string constants 3 @PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyUsages.0") String s1 = "foo.bar"
+[propertyUsages.2.java] Usage in string constants 5 PropertyUsages_1Kt.message("foo.bar");
diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java
index 1afc687edc0..b801c167400 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java
@@ -28,6 +28,7 @@ import com.intellij.find.findUsages.*;
 import com.intellij.find.impl.FindManagerImpl;
 import com.intellij.lang.properties.psi.PropertiesFile;
 import com.intellij.lang.properties.psi.Property;
+import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
@@ -38,6 +39,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.usageView.UsageInfo;
+import com.intellij.usages.TextChunk;
 import com.intellij.usages.UsageGroup;
 import com.intellij.usages.UsageInfo2UsageAdapter;
 import com.intellij.usages.UsageViewPresentation;
@@ -49,6 +51,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.CommonProcessors;
 import kotlin.collections.CollectionsKt;
 import kotlin.jvm.functions.Function1;
+import org.gradle.util.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions;
@@ -66,7 +69,6 @@ import org.jetbrains.kotlin.test.KotlinTestUtils;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -422,10 +424,16 @@ public abstract class AbstractFindUsagesTest extends KotlinLightCodeInsightFixtu
                 UsageType usageType = getUsageType(usageAdapter.getElement());
                 String usageTypeAsString = usageType == null ? "null" : usageType.toString(USAGE_VIEW_PRESENTATION);
 
+                List<TextChunk> usageChunks = new ArrayList<TextChunk>();
+                CollectionUtils.addAll(usageChunks, usageAdapter.getPresentation().getText());
+
+                // Add space after line number
+                usageChunks.add(1, new TextChunk(new TextAttributes(), " "));
+
                 return (appendFileName ? "[" + usageAdapter.getFile().getName() + "] " : "") +
                        usageTypeAsString + " " +
                        groupAsString +
-                       Joiner.on("").join(Arrays.asList(usageAdapter.getPresentation().getText()));
+                       Joiner.on("").join(usageChunks);
             }
         };