From be94fe76f938ee19f139c036c0af6ef0febf98a2 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Sun, 28 Aug 2016 11:06:24 +0300 Subject: [PATCH] One more split test --- .../conventions/components/dataClass.0.java | 2 ++ .../conventions/components/dataClass.5.kt | 11 --------- .../conventions/components/dataClass.log | 19 --------------- .../components/dataClass.results.txt | 9 +------- .../{dataClass.4.kt => lambdas.0.kt} | 13 +++++++++-- .../kotlin/conventions/components/lambdas.log | 23 +++++++++++++++++++ .../components/lambdas.results.txt | 7 ++++++ .../findUsages/FindUsagesTestGenerated.java | 6 +++++ 8 files changed, 50 insertions(+), 40 deletions(-) delete mode 100644 idea/testData/findUsages/kotlin/conventions/components/dataClass.5.kt rename idea/testData/findUsages/kotlin/conventions/components/{dataClass.4.kt => lambdas.0.kt} (67%) create mode 100644 idea/testData/findUsages/kotlin/conventions/components/lambdas.log create mode 100644 idea/testData/findUsages/kotlin/conventions/components/lambdas.results.txt diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.java b/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.java index 86e0d3968d2..6eb94c71668 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.java +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.java @@ -1,3 +1,5 @@ +// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter +// OPTIONS: usages import pack.A; import java.util.Collections; diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.5.kt b/idea/testData/findUsages/kotlin/conventions/components/dataClass.5.kt deleted file mode 100644 index e0982de43e4..00000000000 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.5.kt +++ /dev/null @@ -1,11 +0,0 @@ -package pack5 - -import pack.A - -var Any.v: (A) -> Unit - get() = TODO() - set(value) = TODO() - -fun f() { - "".v = { val (x, y ) = it } -} \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log index 3fab0fa789e..ce4e6fd83e0 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log @@ -14,22 +14,10 @@ Searched references to pack.A Searched references to pack.B Searched references to pack.C Searched references to pack.C.component1() in Kotlin files -Searched references to pack4.takeExtFun() in Kotlin files -Searched references to pack4.takeFun1() in Kotlin files -Searched references to pack4.takeFun2() in Kotlin files -Searched references to pack4.takeFun3() in Kotlin files -Searched references to pack4.takeFuns() in Kotlin files -Searched references to pack5.v in Kotlin files Searched references to parameter a in B() in Kotlin files Searched references to parameter a in null in Kotlin files Searched references to parameter b in pack.f() in Kotlin files Searched references to parameter c in pack.f() in Kotlin files -Searched references to parameter p in pack4.foo() in Kotlin files -Searched references to parameter p in pack4.takeExtFun() in Kotlin files -Searched references to parameter p in pack4.takeFun1() in Kotlin files -Searched references to parameter p in pack4.takeFun2() in Kotlin files -Searched references to parameter p in pack4.takeFun3() in Kotlin files -Searched references to parameter p in pack4.takeFuns() in Kotlin files Used plain search in LocalSearchScope: CLASS:A FUN:ext1 @@ -37,13 +25,6 @@ Used plain search in LocalSearchScope: FUN:x KtWhenEntry "else" KtWhenEntry "is A" - { a, n -> val (x, y) = a!! } - { val (x, y ) = it } - { val (x, y) = it } - { val (x, y) = it } - { val (x, y) = it } - { val (x, y) = it[0] } - { val (x, y) = this } Used plain search in LocalSearchScope: CLASS:B Used plain search in LocalSearchScope: diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt index 2937248a406..edd5cc1dae1 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt @@ -16,11 +16,4 @@ [dataClass.2.kt] Value read 8 val (x, y, z) = a [dataClass.2.kt] Value read 9 val (x1, y1, z1) = f() [dataClass.3.kt] Value read 12 val (x, y, z) = a -[dataClass.3.kt] Value read 15 val (x1, y1, z1) = a1 -[dataClass.4.kt] Value read 18 p[0] = { val (x, y) = it } -[dataClass.4.kt] Value read 24 takeExtFun { val (x, y) = this } -[dataClass.4.kt] Value read 26 takeFun1 { val (x, y) = it } -[dataClass.4.kt] Value read 27 takeFun2 { a, n -> val (x, y) = a!! } -[dataClass.4.kt] Value read 28 takeFun3 { val (x, y) = it[0] } -[dataClass.4.kt] Value read 30 x(p) { val (x, y) = it } -[dataClass.5.kt] Value read 10 "".v = { val (x, y ) = it } \ No newline at end of file +[dataClass.3.kt] Value read 15 val (x1, y1, z1) = a1 \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.4.kt b/idea/testData/findUsages/kotlin/conventions/components/lambdas.0.kt similarity index 67% rename from idea/testData/findUsages/kotlin/conventions/components/dataClass.4.kt rename to idea/testData/findUsages/kotlin/conventions/components/lambdas.0.kt index 81db92e4c12..09eb7fe97f7 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.4.kt +++ b/idea/testData/findUsages/kotlin/conventions/components/lambdas.0.kt @@ -1,6 +1,7 @@ -package pack4 +// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter +// OPTIONS: usages -import pack.A +data class A(val a: Int, val b: Int) fun takeExtFun(p: A.() -> Unit) { } @@ -29,3 +30,11 @@ fun foo(p: A) { x(p) { val (x, y) = it } } + +var Any.v: (A) -> Unit + get() = TODO() + set(value) = TODO() + +fun f() { + "".v = { val (x, y ) = it } +} \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/conventions/components/lambdas.log b/idea/testData/findUsages/kotlin/conventions/components/lambdas.log new file mode 100644 index 00000000000..0bb980b1124 --- /dev/null +++ b/idea/testData/findUsages/kotlin/conventions/components/lambdas.log @@ -0,0 +1,23 @@ +Searched inheritors of A +Searched references to A +Searched references to parameter p in foo() in Kotlin files +Searched references to parameter p in takeExtFun() in Kotlin files +Searched references to parameter p in takeFun1() in Kotlin files +Searched references to parameter p in takeFun2() in Kotlin files +Searched references to parameter p in takeFun3() in Kotlin files +Searched references to parameter p in takeFuns() in Kotlin files +Searched references to takeExtFun() in Kotlin files +Searched references to takeFun1() in Kotlin files +Searched references to takeFun2() in Kotlin files +Searched references to takeFun3() in Kotlin files +Searched references to takeFuns() in Kotlin files +Searched references to v in Kotlin files +Used plain search in LocalSearchScope: + CLASS:A + { a, n -> val (x, y) = a!! } + { val (x, y ) = it } + { val (x, y) = it } + { val (x, y) = it } + { val (x, y) = it } + { val (x, y) = it[0] } + { val (x, y) = this } diff --git a/idea/testData/findUsages/kotlin/conventions/components/lambdas.results.txt b/idea/testData/findUsages/kotlin/conventions/components/lambdas.results.txt new file mode 100644 index 00000000000..00ca6991afc --- /dev/null +++ b/idea/testData/findUsages/kotlin/conventions/components/lambdas.results.txt @@ -0,0 +1,7 @@ +Value read 19 p[0] = { val (x, y) = it } +Value read 25 takeExtFun { val (x, y) = this } +Value read 27 takeFun1 { val (x, y) = it } +Value read 28 takeFun2 { a, n -> val (x, y) = a!! } +Value read 29 takeFun3 { val (x, y) = it[0] } +Value read 31 x(p) { val (x, y) = it } +Value read 39 "".v = { val (x, y ) = it } diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java index 12036a14ede..10c2974ebde 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java @@ -206,6 +206,12 @@ public class FindUsagesTestGenerated extends AbstractFindUsagesTest { doTest(fileName); } + @TestMetadata("lambdas.0.kt") + public void testLambdas() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/components/lambdas.0.kt"); + doTest(fileName); + } + @TestMetadata("memberComponentFun.0.kt") public void testMemberComponentFun() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/components/memberComponentFun.0.kt");