diff --git a/idea/testData/findUsages/kotlin/conventions/components/SAM.0.java b/idea/testData/findUsages/kotlin/conventions/components/SAM.0.java new file mode 100644 index 00000000000..52a944575d9 --- /dev/null +++ b/idea/testData/findUsages/kotlin/conventions/components/SAM.0.java @@ -0,0 +1,9 @@ +import pack.A; + +class JavaClass { + public void takeSAM(JavaSAM sam){} +} + +public interface JavaSAM { + void takeA(A a); +} diff --git a/idea/testData/findUsages/kotlin/conventions/components/SAM.0.kt b/idea/testData/findUsages/kotlin/conventions/components/SAM.0.kt new file mode 100644 index 00000000000..88746b24f08 --- /dev/null +++ b/idea/testData/findUsages/kotlin/conventions/components/SAM.0.kt @@ -0,0 +1,5 @@ +// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter +// OPTIONS: usages +package pack + +data class A(val a: Int, val b: String) \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.6.kt b/idea/testData/findUsages/kotlin/conventions/components/SAM.1.kt similarity index 100% rename from idea/testData/findUsages/kotlin/conventions/components/dataClass.6.kt rename to idea/testData/findUsages/kotlin/conventions/components/SAM.1.kt diff --git a/idea/testData/findUsages/kotlin/conventions/components/SAM.log b/idea/testData/findUsages/kotlin/conventions/components/SAM.log new file mode 100644 index 00000000000..2bd78a52fb9 --- /dev/null +++ b/idea/testData/findUsages/kotlin/conventions/components/SAM.log @@ -0,0 +1,7 @@ +Searched inheritors of pack.A +Searched references to JavaClass.takeSAM() in Kotlin files +Searched references to JavaSAM in java files +Searched references to pack.A +Used plain search in LocalSearchScope: + CLASS:A + { val (x, y) = it } diff --git a/idea/testData/findUsages/kotlin/conventions/components/SAM.results.txt b/idea/testData/findUsages/kotlin/conventions/components/SAM.results.txt new file mode 100644 index 00000000000..cb0efda1a19 --- /dev/null +++ b/idea/testData/findUsages/kotlin/conventions/components/SAM.results.txt @@ -0,0 +1 @@ +Value read 4 javaClass.takeSAM { val (x, y) = it } diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.java b/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.java index 967e481cc69..86e0d3968d2 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.java +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.0.java @@ -1,4 +1,3 @@ -import kotlin.Unit; import pack.A; import java.util.Collections; @@ -11,10 +10,4 @@ class JavaClass { } public void takeA(A a){} - - public void takeSAM(JavaSAM sam){} -} - -public interface JavaSAM { - void takeA(A a); } diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log index 4efc9664a70..3fab0fa789e 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log @@ -2,8 +2,6 @@ Searched inheritors of pack.A Searched inheritors of pack.B Searched inheritors of pack.C Searched references to JavaClass.getA() in Kotlin files -Searched references to JavaClass.takeSAM() in Kotlin files -Searched references to JavaSAM in java files Searched references to a in Kotlin files Searched references to a in Kotlin files Searched references to a1 in Kotlin files @@ -44,7 +42,6 @@ Used plain search in LocalSearchScope: { 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: diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt index b81aedc66aa..2937248a406 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt @@ -23,5 +23,4 @@ [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 } -[dataClass.6.kt] Value read 4 javaClass.takeSAM { val (x, y) = it } +[dataClass.5.kt] Value read 10 "".v = { val (x, y ) = it } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java index 997cbc6d4e7..12036a14ede 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java @@ -211,6 +211,12 @@ public class FindUsagesTestGenerated extends AbstractFindUsagesTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/components/memberComponentFun.0.kt"); doTest(fileName); } + + @TestMetadata("SAM.0.kt") + public void testSAM() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/components/SAM.0.kt"); + doTest(fileName); + } } }