Find Usages: Add file grouping to test data

2015-06-05 14:26:10 +03:00
parent d4bf5faeec
commit 64ae0c0036
38 changed files with 217 additions and 203 deletions
@@ -1,6 +1,6 @@
-New instance creation (10: 13) new B("");
-New instance creation (22: 5) B("")
-Supertype (17: 11) class C : B("") {
-Unclassified usage (12: 27) constructor(a: Int) : super("") {
-Unclassified usage (2: 20) constructor(): this("") {
-Unclassified usage (6: 9) super("");
+[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("") {
@@ -1,6 +1,6 @@
-New instance creation (10: 13) new B("");
-New instance creation (22: 5) B("")
-Supertype (17: 11) class C : B("") {
-Unclassified usage (12: 27) constructor(a: Int) : super("") {
-Unclassified usage (2: 20) constructor(): this("") {
-Unclassified usage (6: 9) super("");
+[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("") {
@@ -1,4 +1,4 @@
-Unclassified usage (11: 17) public void foo() {
-Unclassified usage (14: 25) public override fun foo() {
-Unclassified usage (2: 25) public override fun foo() {
-Unclassified usage (8: 25) public override fun foo() {
+[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() {
@@ -1,4 +1,4 @@
-Function call (9: 7) a.component1()
-Value read (10: 9) val (x, y, z) = a
-Value read (2: 10) for ((x, y, z) in array<A>()) {
-Value read (8: 7) a.n
+[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 array<A>()) {
@@ -1,3 +1,3 @@
-Unclassified usage (11: 12) open class C: Y {
-Unclassified usage (1: 7) class B extends A {
-Unclassified usage (7: 12) open class A: X {
+[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 {
@@ -1,2 +1,2 @@
-Unclassified usage (15: 11) interface Z: A {
-Unclassified usage (9: 11) interface U extends Z {
+[javaDerivedInterfaceUsages1.0.kt] Unclassified usage (15: 11) interface Z: A {
+[javaDerivedInterfaceUsages1.1.java] Unclassified usage (9: 11) interface U extends Z {
@@ -1,3 +1,3 @@
-Unclassified usage (15: 11) interface Z: A {
-Unclassified usage (5: 11) interface Y extends X {
-Unclassified usage (9: 11) interface U extends Z {
+[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 {
@@ -1,5 +1,5 @@
-Supertype (24: 22) object ClientObject: Server() {
-Supertype (5: 15) class Client: Server() {
-Unclassified usage (29: 31) constructor(name: String) {
-Unclassified usage (33: 20) constructor(): super() {
-Unclassified usage (6: 32) constructor(name: String): this() {
+[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() {
@@ -1,21 +1,21 @@
-Class/object property type (6: 21) var next: Inner.A? = Inner.A()
-Companion object (10: 15) Inner.A.bar = ""
-Companion object (11: 15) Inner.A.foo()
-Companion object (5: 37) public class X(bar: String? = Inner.A.bar): Inner.A() {
-Companion object (7: 32) val myBar: String? = Inner.A.bar
-Field declaration (6: 11) Inner.A next = new Inner.A();
-Function return types (19: 26) fun getNext(): Inner.A? {
-Function return types (40: 22) fun Any.toA(): Inner.A? {
-Local variable declaration (15: 23) val aa: Inner.A = a
-New instance creation (36: 30) fun X.bar(a: Inner.A = Inner.A()) {
-New instance creation (6: 30) Inner.A next = new Inner.A();
-New instance creation (6: 32) var next: Inner.A? = Inner.A()
-Parameter type (14: 22) fun foo(a: Inner.A) {
-Parameter type (36: 20) fun X.bar(a: Inner.A = Inner.A()) {
-Super type qualifier (24: 21) super<Inner.A>.foo()
-Supertype (27: 29) companion object: Inner.A() {
-Supertype (32: 17) object O: Inner.A() {
-Supertype (5: 51) public class X(bar: String? = Inner.A.bar): Inner.A() {
-Target type of 'is' operation (41: 30) return if (this is Inner.A) this as Inner.A else null
-Usage in cast target type (41: 47) return if (this is Inner.A) this as Inner.A else null
-Usage in extends/implements clause (5: 30) public class X extends Inner.A {
+[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 {
@@ -1,21 +1,21 @@
-Class/object property type (7: 25) var next: Outer.A? = (this@KOuter : Outer).A()
-Field declaration (10: 5) A next = new A();
-Function return types (19: 30) fun getNext(): Outer.A? {
-Function return types (33: 22) fun Any.toA(): Outer.A? {
-Function return types (37: 27) fun Any.asServer(): Outer.A? {
-Local variable declaration (15: 27) val aa: Outer.A = a
-New instance creation (10: 18) A next = new A();
-New instance creation (11: 35) (this@KOuter : Outer).A().bar = ""
-New instance creation (29: 39) fun KOuter.X.bar(a: Outer.A = Outer().A()) {
-New instance creation (6: 63) public inner class X(bar: String? = (this@KOuter : Outer).A().bar): Outer.A() {
-New instance creation (7: 52) var next: Outer.A? = (this@KOuter : Outer).A()
-New instance creation (8: 52) val myBar: String? = (this@KOuter : Outer).A().bar
-Parameter type (14: 26) fun foo(a: Outer.A) {
-Parameter type (29: 27) fun KOuter.X.bar(a: Outer.A = Outer().A()) {
-Super type qualifier (24: 25) super<Outer.A>.foo()
-Supertype (6: 79) public inner class X(bar: String? = (this@KOuter : Outer).A().bar): Outer.A() {
-Target type of 'is' operation (34: 30) return if (this is Outer.A) this as Outer.A else null
-Target type of 'is' operation (38: 30) return if (this is Outer.A) this as Outer.A else null
-Usage in cast target type (34: 47) return if (this is Outer.A) this as Outer.A else null
-Usage in cast target type (38: 47) return if (this is Outer.A) this as Outer.A else null
-Usage in extends/implements clause (6: 21) class Y extends A {
+[kotlinInnerClassAllUsages.1.kt] Class/object property type (7: 25) var next: Outer.A? = (this@KOuter : 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: 35) (this@KOuter : 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: 63) public inner class X(bar: String? = (this@KOuter : Outer).A().bar): Outer.A() {
+[kotlinInnerClassAllUsages.1.kt] New instance creation (7: 52) var next: Outer.A? = (this@KOuter : Outer).A()
+[kotlinInnerClassAllUsages.1.kt] New instance creation (8: 52) val myBar: String? = (this@KOuter : 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: 79) public inner class X(bar: String? = (this@KOuter : 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 {
@@ -1,21 +1,21 @@
-Class/object property type (6: 21) var next: Outer.A? = Outer.A()
-Companion object (10: 15) Outer.A.bar = ""
-Companion object (11: 15) Outer.A.foo()
-Companion object (5: 37) public class X(bar: String? = Outer.A.bar): Outer.A() {
-Companion object (7: 32) val myBar: String? = Outer.A.bar
-Field declaration (6: 11) Outer.A next = new Outer.A();
-Function return types (19: 26) fun getNext(): Outer.A? {
-Function return types (40: 22) fun Any.toA(): Outer.A? {
-Local variable declaration (15: 23) val aa: Outer.A = a
-New instance creation (36: 30) fun X.bar(a: Outer.A = Outer.A()) {
-New instance creation (6: 30) Outer.A next = new Outer.A();
-New instance creation (6: 32) var next: Outer.A? = Outer.A()
-Parameter type (14: 22) fun foo(a: Outer.A) {
-Parameter type (36: 20) fun X.bar(a: Outer.A = Outer.A()) {
-Super type qualifier (24: 21) super<Outer.A>.foo()
-Supertype (27: 29) companion object: Outer.A() {
-Supertype (32: 17) object O: Outer.A() {
-Supertype (5: 51) public class X(bar: String? = Outer.A.bar): Outer.A() {
-Target type of 'is' operation (41: 30) return if (this is Outer.A) this as Outer.A else null
-Usage in cast target type (41: 47) return if (this is Outer.A) this as Outer.A else null
-Usage in extends/implements clause (5: 30) public class X extends Outer.A {
+[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 {
@@ -1,4 +1,4 @@
-Unclassified usage (12: 17) val x = object : X {
-Unclassified usage (7: 12) open class A: X {
-Unclassified usage (9: 17) doSomething(object : A() {}, object: X {})
-Unclassified usage (9: 34) doSomething(object : A() {}, object: X {})
+[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 {})
@@ -1,3 +1,3 @@
-Unclassified usage (3: 12) open class B: A() {
-Unclassified usage (7: 12) open class A: X {
-Unclassified usage (7: 12) open class C: Y {
+[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 {
@@ -1,3 +1,3 @@
-Unclassified usage (4: 16) open class B: A() {
-Unclassified usage (7: 12) open class A: X {
-Unclassified usage (8: 16) open class C: Y {
+[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 {
@@ -1,3 +1,3 @@
-Unclassified usage (4: 12) object O1: A() {
-Unclassified usage (7: 12) open class A: X {
-Unclassified usage (9: 16) object O2: X {
+[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 {
@@ -1,3 +1,3 @@
-Unclassified usage (5: 16) open class B: A() {
-Unclassified usage (7: 12) open class A: X {
-Unclassified usage (9: 16) open class C: Y {
+[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 {
@@ -1,3 +1,3 @@
-Unclassified usage (10: 16) object O2: X {
-Unclassified usage (5: 12) object O1: A() {
-Unclassified usage (7: 12) open class A: X {
+[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() {
@@ -1,3 +1,3 @@
-Unclassified usage (3: 8) object O1: A() {
-Unclassified usage (7: 12) open class A: X {
-Unclassified usage (7: 8) object O2: X {
+[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 {
@@ -1,3 +1,3 @@
-Unclassified usage (11: 11) interface Y: X {
-Unclassified usage (11: 11) interface Z: A {
-Unclassified usage (15: 11) interface U: Z {
+[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 {
@@ -1,2 +1,2 @@
-Unclassified usage (29: 18) override fun foo(t: String) {
-Unclassified usage (3: 17) public void foo(String s) {
+[javaAndKotlinOverrides.0.kt] Unclassified usage (29: 18) override fun foo(t: String) {
+[javaAndKotlinOverrides.1.java] Unclassified usage (3: 17) public void foo(String s) {
@@ -1,7 +1,7 @@
-Function call (11: 11) a.foo(0, "")
-Function call (11: 7) x.foo(1, 2)
-Function call (25: 5) foo(t)
-Function call (30: 7) a.foo(1, "")
-Function call (35: 9) foo(t)
-Function call (39: 5) foo(s)
-Function call (3: 18) super<A>.foo(t)
+[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)
@@ -1,5 +1,5 @@
-Callable reference (6: 23) val methodRef = ::processRequest()
-Function call (10: 9) processRequest()
-Unclassified usage (6: 30) String s = ServerPackage.processRequest();
-Unclassified usage (9: 30) return ServerPackage.processRequest();
-Usage in import (3: 15) import server.processRequest
+[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: 30) String s = ServerPackage.processRequest();
+[kotlinTopLevelMethodUsages.2.java] Unclassified usage (9: 30) return ServerPackage.processRequest();
@@ -1,2 +1,2 @@
-Function call (11: 53) fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
-Unclassified usage (7: 14) some.foo();
+[kotlinTraitImplThroughDelegate.0.kt] Function call (11: 53) fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
+[kotlinTraitImplThroughDelegate.1.java] Unclassified usage (7: 14) some.foo();
@@ -1,2 +1,2 @@
-Function call (11: 51) fun test(twdni: TraitWithDelegatedNoImpl) = twdni.foo()
-Unclassified usage (7: 14) some.foo();
+[kotlinTraitNoImplThroughDelegate.0.kt] Function call (11: 51) fun test(twdni: TraitWithDelegatedNoImpl) = twdni.foo()
+[kotlinTraitNoImplThroughDelegate.1.java] Unclassified usage (7: 14) some.foo();
@@ -1,5 +1,5 @@
-Unclassified usage (12: 17) public void setFoo(String s) {
-Unclassified usage (13: 9) set(value: String) {
-Unclassified usage (25: 18) override var foo: String = ""
-Unclassified usage (7: 19) public String getFoo() {
-Unclassified usage (9: 9) get() {
+[javaAndKotlinOverrides.0.kt] Unclassified usage (13: 9) set(value: String) {
+[javaAndKotlinOverrides.0.kt] Unclassified usage (25: 18) override var foo: String = ""
+[javaAndKotlinOverrides.0.kt] Unclassified usage (9: 9) get() {
+[javaAndKotlinOverrides.1.java] Unclassified usage (12: 17) public void setFoo(String s) {
+[javaAndKotlinOverrides.1.java] Unclassified usage (7: 19) public String getFoo() {
@@ -1,6 +1,6 @@
-Unclassified usage (11: 9) set(value: String) {
-Unclassified usage (12: 17) public void setFoo(String s) {
-Unclassified usage (23: 18) override var foo: String = ""
-Unclassified usage (26: 30) open class E<T>(override var foo: T): A<T>(foo)
-Unclassified usage (7: 19) public String getFoo() {
-Unclassified usage (7: 9) get() {
+[javaAndKotlinOverrides2.0.kt] Unclassified usage (11: 9) set(value: String) {
+[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 (7: 9) get() {
+[javaAndKotlinOverrides2.1.java] Unclassified usage (12: 17) public void setFoo(String s) {
+[javaAndKotlinOverrides2.1.java] Unclassified usage (7: 19) public String getFoo() {
@@ -1,2 +1,2 @@
-Unclassified usage (7: 22) int i = Some.XX;
-Value read (11: 14) val a = Some.XX
+[kotlinClassObjectPropertyUsage.0.kt] Value read (11: 14) val a = Some.XX
+[kotlinClassObjectPropertyUsage.1.java] Unclassified usage (7: 22) int i = Some.XX;
@@ -1,3 +1,3 @@
-Value read (11: 30) println("b.foo = ${b.foo}")
-Value read (13: 29) return super<A>.foo
-Value read (7: 30) println("a.foo = ${a.foo}")
+[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}")
@@ -1,3 +1,3 @@
-Value read (11: 29) return super<A>.foo
-Value read (11: 30) println("b.foo = ${b.foo}")
-Value read (7: 30) println("a.foo = ${a.foo}")
+[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}")
@@ -1,6 +1,6 @@
-Value read (11: 30) println("b.foo = ${b.foo}")
-Value read (13: 29) return super<A>.foo
-Value read (7: 30) println("a.foo = ${a.foo}")
-Value write (10: 11) b.foo = "b"
-Value write (17: 22) super<A>.foo = value
-Value write (6: 11) a.foo = "a"
+[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"
@@ -1,6 +1,6 @@
-Value read (11: 29) return super<A>.foo
-Value read (11: 30) println("b.foo = ${b.foo}")
-Value read (7: 30) println("a.foo = ${a.foo}")
-Value write (10: 11) b.foo = "b"
-Value write (15: 22) super<A>.foo = value
-Value write (6: 11) a.foo = "a"
+[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"
@@ -1,3 +1,3 @@
-Value write (10: 11) b.foo = "b"
-Value write (17: 22) super<A>.foo = value
-Value write (6: 11) a.foo = "a"
+[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"
@@ -1,3 +1,3 @@
-Value write (10: 11) b.foo = "b"
-Value write (15: 22) super<A>.foo = value
-Value write (6: 11) a.foo = "a"
+[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"
@@ -1,6 +1,6 @@
-Receiver (8: 35) println("length: ${server.foo.length()}")
-Unclassified usage (7: 53) System.out.println("foo = " + ServerPackage.getFoo());
-Unclassified usage (8: 55) System.out.println("length: " + ServerPackage.getFoo().length());
-Unclassified usage (9: 23) ServerPackage.setFoo("");
-Usage in import (3: 15) import server.foo
-Value read (7: 33) println("foo = ${server.foo}")
+[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: 53) System.out.println("foo = " + ServerPackage.getFoo());
+[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (8: 55) System.out.println("length: " + ServerPackage.getFoo().length());
+[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (9: 23) ServerPackage.setFoo("");
@@ -1,8 +1,8 @@
-New instance creation (11: 13) new B();
-New instance creation (28: 5) B()
-Supertype (23: 11) class C : B() {
-Unclassified usage (14: 27) constructor(a: Int) : super() {
-Unclassified usage (18: 19) constructor() {
-Unclassified usage (3: 9) super();
-Unclassified usage (6: 12) public J() {
-Unclassified usage (8: 26) constructor(a: Int): this() {
+[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() {
@@ -1,6 +1,6 @@
-New instance creation (24: 5) B("")
-New instance creation (7: 13) new B("");
-Supertype (19: 10) class C: B("") {
-Unclassified usage (14: 27) constructor(a: Int) : super("") {
-Unclassified usage (3: 9) super("");
-Unclassified usage (4: 20) constructor(): this("") {
+[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("");
@@ -1,6 +1,6 @@
-Value read (B) (14: 29) return super<A>.foo
-Value read (Client) (11: 30) println("b.foo = ${b.foo}")
-Value read (Client) (7: 30) println("a.foo = ${a.foo}")
-Value write (B) (18: 22) super<A>.foo = value
-Value write (Client) (10: 11) b.foo = "b"
-Value write (Client) (6: 11) a.foo = "a"
+[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"
@@ -357,6 +357,19 @@ public abstract class AbstractJetFindUsagesTest extends JetLightCodeInsightFixtu

        Collection<UsageInfo2UsageAdapter> filteredUsages = getUsageAdapters(filteringRules, usageInfos);

+        List<String> usageFiles = KotlinPackage.distinct(
+                KotlinPackage.map(
+                        filteredUsages,
+                        new Function1<UsageInfo2UsageAdapter, String>() {
+                            @Override
+                            public String invoke(UsageInfo2UsageAdapter adapter) {
+                                return adapter.getFile().getName();
+                            }
+                        }
+                )
+        );
+        final boolean appendFileName = usageFiles.size() > 1;
+
        Function<UsageInfo2UsageAdapter, String> convertToString = new Function<UsageInfo2UsageAdapter, String>() {
            @Override
            public String apply(@Nullable final UsageInfo2UsageAdapter usageAdapter) {
@@ -381,7 +394,8 @@ public abstract class AbstractJetFindUsagesTest extends JetLightCodeInsightFixtu
                UsageType usageType = getUsageType(usageAdapter.getElement());
                String usageTypeAsString = usageType == null ? "null" : usageType.toString(USAGE_VIEW_PRESENTATION);

-                return usageTypeAsString + " " +
+                return (appendFileName ? "[" + usageAdapter.getFile().getName() + "] " : "") +
+                       usageTypeAsString + " " +
                       groupAsString +
                       Joiner.on("").join(Arrays.asList(usageAdapter.getPresentation().getText()));
            }