From 54e89b72d47e9ea60a2f071ac1f3cf5b4643a5cb Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Tue, 8 Dec 2015 18:59:05 +0300 Subject: [PATCH] Update lookupTracker test data for tower resolution algorithm Original commit: 79b30dddf9f66d9130859ba5a7e3faeb5c90cba4 --- .../lookupTracker/classifierMembers/foo.kt | 10 ++-- .../lookupTracker/classifierMembers/usages.kt | 46 +++++++++---------- .../lookupTracker/conventions/comparison.kt | 8 ++-- .../conventions/delegateProperty.kt | 12 ++--- .../conventions/mathematicalLike.kt | 14 +++--- .../lookupTracker/conventions/other.kt | 12 ++--- .../incremental/lookupTracker/java/usages.kt | 2 +- .../lookupTracker/localDeclarations/locals.kt | 2 +- .../lookupTracker/packageDeclarations/foo1.kt | 10 ++-- .../syntheticProperties/usages.kt | 16 +++---- 10 files changed, 66 insertions(+), 66 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 34f67fad97a..d724928ceb2 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,9 +18,9 @@ import bar.* /*c:foo.A*/foo() this./*c:foo.A*/a this./*c:foo.A*/foo() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A(getBaz) c:foo.A(getBAZ)*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/O./*c:foo.A.O*/v = "OK" + /*c:foo.A c:foo.A.Companion*/baz() + /*c:foo.A*/Companion./*c:foo.A.Companion*/a + /*c:foo.A*/O./*c:foo.A.O*/v = "OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = 1 fun foo() { /*c:foo.E*/a - /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Y./*c:foo.E*/a + /*c:foo.E*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/X./*c:foo.E*/foo() + /*c:foo.E*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 85b1ca467b4..eecd3a6242d 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -3,38 +3,38 @@ package foo import bar.* /*p:foo*/fun usages(i: /*p:foo*/I) { - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/b - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/c - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/d = "new value" - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B()./*c:foo.A.B*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/baz() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/Companion - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA)*/vala - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA)*/vara() + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/a + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/b + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/c + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/d = "new value" + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/foo() + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a + /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) + /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) + /*p:foo*/A + /*p:foo*/A./*c:foo.A c:foo.A.Companion*/a + /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() + /*p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion + /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() + /*p:foo*/A./*c:foo.A c:foo.A.Companion*/O + /*p:foo*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" + /*p:foo*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA)*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA)*/vara() i./*c:foo.I*/a = 2 - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/foo() - var ii: /*p:foo*/I = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj + /*p:foo*/Obj./*c:foo.Obj*/a + /*p:foo*/Obj./*c:foo.Obj*/foo() + var ii: /*p:foo*/I = /*p:foo*/Obj ii./*c:foo.I*/a ii./*c:foo.I*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/b - val iii = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/bar() + /*p:foo*/Obj./*c:foo.Obj*/b + val iii = /*p:foo*/Obj./*c:foo.Obj*/bar() iii./*c:foo.I*/foo() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X./*c:foo.E*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/values() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E p:foo(invoke) p:bar(invoke) p:java.lang(invoke) p:kotlin(invoke) p:kotlin.annotation(invoke) p:kotlin.jvm(invoke) p:kotlin.io(invoke)*/values() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/valueOf("") /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/foo /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/bar() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt index d7f73c68b45..45124e49c44 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt @@ -11,8 +11,8 @@ package foo.bar a /*c:foo.bar.A(compareTo)*/>= b a /*c:foo.bar.A(compareTo)*/<= b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/> c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/< c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/>= c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/<= c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= c } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index d444859d877..34f86b9f118 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,11 +20,11 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) p:foo.bar(setValue) p:java.lang(setValue) p:kotlin(setValue) p:kotlin.annotation(setValue) p:kotlin.jvm(setValue) p:kotlin.io(setValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D2(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D2(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D2() +/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D3(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D3(propertyDelegated)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D3(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D3(setValue) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index 69c457b8ef9..b43a8b57bf4 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -5,20 +5,20 @@ package foo.bar d/*c:foo.bar.A(inc)*/++ /*c:foo.bar.A(inc)*/++d - d/*c:foo.bar.A(dec) p:foo.bar(dec) p:java.lang(dec) p:kotlin(dec) p:kotlin.annotation(dec) p:kotlin.jvm(dec) p:kotlin.io(dec)*/-- - /*c:foo.bar.A(dec) p:foo.bar(dec) p:java.lang(dec) p:kotlin(dec) p:kotlin.annotation(dec) p:kotlin.jvm(dec) p:kotlin.io(dec)*/--d + d/*c:foo.bar.A(dec) p:foo.bar(dec)*/-- + /*c:foo.bar.A(dec) p:foo.bar(dec)*/--d a /*c:foo.bar.A(plus)*/+ b - a /*c:foo.bar.A(minus) p:foo.bar(minus) p:java.lang(minus) p:kotlin(minus) p:kotlin.annotation(minus) p:kotlin.jvm(minus) p:kotlin.io(minus)*/- b - /*c:foo.bar.A(not) p:foo.bar(not) p:java.lang(not) p:kotlin(not) p:kotlin.annotation(not) p:kotlin.jvm(not) p:kotlin.io(not)*/!a + a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- b + /*c:foo.bar.A(not) p:foo.bar(not)*/!a // for val a /*c:foo.bar.A(timesAssign)*/*= b - a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) p:java.lang(divAssign) p:kotlin(divAssign) p:kotlin.annotation(divAssign) p:kotlin.jvm(divAssign) p:kotlin.io(divAssign)*//= b + a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= b // for var d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) c:foo.bar.A(plus)*/+= b - d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus) p:java.lang(minus) p:kotlin(minus) p:kotlin.annotation(minus) p:kotlin.jvm(minus) p:kotlin.io(minus)*/-= b + d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus)*/-= b d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.io(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES)*/*= b - d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) p:java.lang(divAssign) p:kotlin(divAssign) p:kotlin.annotation(divAssign) p:kotlin.jvm(divAssign) p:kotlin.io(divAssign) c:foo.bar.A(div) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.io(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b + d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(div) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.io(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt index 9e9e8aa46d4..d1b1fca1636 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -1,16 +1,16 @@ package foo.bar /*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { - /*c:foo.bar.A(set) p:foo.bar(set) p:java.lang(set) p:kotlin(set) p:kotlin.annotation(set) p:kotlin.jvm(set) p:kotlin.io(set)*/a[1] = /*c:foo.bar.A(get)*/a[2] + /*c:foo.bar.A(set) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get)*/a[2] b /*c:foo.bar.A(contains)*/in a - "s" /*c:foo.bar.A(contains) p:foo.bar(contains) p:java.lang(contains) p:kotlin(contains) p:kotlin.annotation(contains) p:kotlin.jvm(contains) p:kotlin.io(contains)*/!in a + "s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in a /*c:foo.bar.A(invoke)*/a() - /*c:foo.bar.A(invoke) p:foo.bar(invoke) p:java.lang(invoke) p:kotlin(invoke) p:kotlin.annotation(invoke) p:kotlin.jvm(invoke) p:kotlin.io(invoke)*/a(1) + /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1) - val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2)*/t) = a; + val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = a; - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) p:java.lang(hasNext) p:kotlin(hasNext) p:kotlin.annotation(hasNext) p:kotlin.jvm(hasNext) p:kotlin.io(hasNext) c:foo.bar.A(next)*/a); - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) p:java.lang(iterator) p:kotlin(iterator) p:kotlin.annotation(iterator) p:kotlin.jvm(iterator) p:kotlin.io(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) p:java.lang(hasNext) p:kotlin(hasNext) p:kotlin.annotation(hasNext) p:kotlin.jvm(hasNext) p:kotlin.io(hasNext) c:foo.bar.A(next)*/na); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index f836b6e74c9..0f0c9745c72 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -4,7 +4,7 @@ import bar./*p:bar*/C import baz.* /*p:foo*/fun usages() { - val c = /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C() + val c = C() c./*c:bar.C*/field c./*c:bar.C*/field = 2 diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt index 3ba9645f6c2..f139ae7a727 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt @@ -31,7 +31,7 @@ import bar.* } localFun() - 1./*p:local.declarations p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/localExtFun() + 1.localExtFun() val c = LocalC() c.a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index d859f60fc67..20e33188aaa 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -3,15 +3,15 @@ package foo import bar.* import baz./*p:baz*/C -/*p:foo*/val a = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A() +/*p:foo*/val a = /*p:foo p:bar*/A() /*p:foo*/var b: /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B { - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/a - return /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/B() + /*p:foo*/a + return /*p:foo p:bar*/B() } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface { - /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.MyClass(getB)*/b - return /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/MyClass() + /*c:foo.MyClass p:foo*/b + return /*c:foo.MyClass p:foo*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 1d737978e1d..34670329dbd 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -4,8 +4,8 @@ import /*p:*/JavaClass import foo./*p:foo*/KotlinClass /*p:foo.bar*/fun test() { - val j = /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/JavaClass() - val k = /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/KotlinClass() + val j = JavaClass() + val k = KotlinClass() j./*c:JavaClass*/getFoo() j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getSetFoo) c:JavaClass(getSETFoo)*/setFoo(2) @@ -17,14 +17,14 @@ import foo./*p:foo*/KotlinClass j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz = "" j./*c:JavaClass*/setBoo(2) j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBoo) c:JavaClass(getBOO)*/boo = 2 - k./*c:foo.KotlinClass*/getFoo() - k./*c:foo.KotlinClass*/setFoo(2) + k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass + k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = 2 k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = "" - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz)*/bazBaz - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz)*/bazBaz = "" - k./*c:foo.KotlinClass*/setBoo(2) - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO)*/boo = 2 + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) c:JavaClass*/bazBaz + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) c:JavaClass*/bazBaz = "" + k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) c:JavaClass*/boo = 2 }