From 583eb1533083e54a0dce3e7aed8c69aea9bcd6fa Mon Sep 17 00:00:00 2001 From: Kirill Kirichenko Date: Fri, 14 May 2021 17:40:06 +0300 Subject: [PATCH] IDEA-231364 Implement Find Usages tool window. Fix kotlin and android tests. GitOrigin-RevId: dbb994dcb19442d3fc17b7efa71cff8ab6c7f431 --- .../psi/usages/JavaUsageViewTreeTest.java | 2 +- .../testData/kdoc/resolve/StaticMember.kt | 2 +- .../navigation/gotoSymbol/javaMethods.kt | 6 ++-- .../ImplementFunInJava/ImplementFunInJava.kt | 2 +- .../ImplementJavaInnerInterface.java | 2 +- .../ImplementJavaInnerInterfaceFromUsage.java | 2 +- .../ImplementMethodInKotlin.kt | 2 +- .../ImplementVarInJava/ImplementVarInJava.kt | 4 +-- .../overridingFunctionWithSamAdapter.kt | 2 +- .../references/JavaAnnotationParameter.kt | 2 +- .../JavaConstructorNotNullParameter.kt | 2 +- .../resolve/references/JavaEnumEntry.kt | 2 +- .../resolve/references/ReferenceToSam.kt | 2 +- .../testData/resolve/references/SamAdapter.kt | 2 +- .../resolve/references/SyntheticProperty.kt | 28 +++++++++---------- .../definition/navigation/javaLib/script.kts | 2 +- .../navigation/javaLibWithSources/script.kts | 2 +- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/psi/usages/JavaUsageViewTreeTest.java b/java/java-tests/testSrc/com/intellij/java/psi/usages/JavaUsageViewTreeTest.java index 8e3a8d344a50..fba9dbcba97b 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/usages/JavaUsageViewTreeTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/usages/JavaUsageViewTreeTest.java @@ -42,7 +42,7 @@ public class JavaUsageViewTreeTest extends LightJavaCodeInsightFixtureTestCase { PsiReference ref = ReferencesSearch.search(foo).findFirst(); assertNotNull(ref); assertEquals(" (1)\n" + - " Found usages (1)\n" + + " Usages in (1)\n" + " A (1)\n" + " bar() (1)\n" + " 3{ foo();\n", myFixture.getUsageViewTreeTextRepresentation(Collections.singleton(new UsageInfo(ref)))); diff --git a/plugins/kotlin/idea/tests/testData/kdoc/resolve/StaticMember.kt b/plugins/kotlin/idea/tests/testData/kdoc/resolve/StaticMember.kt index b08af84c1548..af31078bceda 100644 --- a/plugins/kotlin/idea/tests/testData/kdoc/resolve/StaticMember.kt +++ b/plugins/kotlin/idea/tests/testData/kdoc/resolve/StaticMember.kt @@ -3,4 +3,4 @@ class T { } -// REF: (in java.lang.Integer).MAX_VALUE +// REF: of java.lang.Integer.MAX_VALUE diff --git a/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/javaMethods.kt b/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/javaMethods.kt index f1280cbf2ccf..93b9c4828896 100644 --- a/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/javaMethods.kt +++ b/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/javaMethods.kt @@ -4,6 +4,6 @@ fun test() { // SEARCH_TEXT: flushBuffer // CHECK_BOX -// REF: (in java.io.BufferedOutputStream).flushBuffer() -// REF: (in java.io.BufferedWriter).flushBuffer() -// REF: (in java.io.OutputStreamWriter).flushBuffer() +// REF: of java.io.BufferedOutputStream.flushBuffer() +// REF: of java.io.BufferedWriter.flushBuffer() +// REF: of java.io.OutputStreamWriter.flushBuffer() diff --git a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementFunInJava/ImplementFunInJava.kt b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementFunInJava/ImplementFunInJava.kt index e25ddd658e56..183d581abb15 100644 --- a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementFunInJava/ImplementFunInJava.kt +++ b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementFunInJava/ImplementFunInJava.kt @@ -4,4 +4,4 @@ open class KotlinBase { open fun test() {} } -// REF: (in testing.jj.JavaBase).test() +// REF: of testing.jj.JavaBase.test() diff --git a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java index 366aa88a04ff..9b3006376375 100644 --- a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java +++ b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java @@ -24,6 +24,6 @@ public class ImplementJavaInnerInterface { } } -// REF: (in ImplementJavaInnerInterface.OtherJava).foo() +// REF: of ImplementJavaInnerInterface.OtherJava.foo() // REF: (in KotlinTest).foo() // REF: .foo() \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java index 8da8f3d230ce..6c9aacbb8d31 100644 --- a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java +++ b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java @@ -24,6 +24,6 @@ public class ImplementJavaInnerInterfaceFromUsage { } } -// REF: (in ImplementJavaInnerInterfaceFromUsage.OtherJava).foo() +// REF: of ImplementJavaInnerInterfaceFromUsage.OtherJava.foo() // REF: (in KotlinTest).foo() // REF: .foo() \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementMethodInKotlin/ImplementMethodInKotlin.kt b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementMethodInKotlin/ImplementMethodInKotlin.kt index 93fc1c179c5d..22a0e9186490 100644 --- a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementMethodInKotlin/ImplementMethodInKotlin.kt +++ b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementMethodInKotlin/ImplementMethodInKotlin.kt @@ -8,4 +8,4 @@ fun test() { } // REF: (in TestFromJava).testMethod() -// REF: (in BaseJava).testMethod() +// REF: of BaseJava.testMethod() diff --git a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementVarInJava/ImplementVarInJava.kt b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementVarInJava/ImplementVarInJava.kt index c1d0b9b85404..6dd1adee7041 100644 --- a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementVarInJava/ImplementVarInJava.kt +++ b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementVarInJava/ImplementVarInJava.kt @@ -4,5 +4,5 @@ open class KotlinBase { open var some = "Test" } -// REF: (in testing.jj.JavaBase).getSome() -// REF: (in testing.jj.JavaBase).setSome(String) \ No newline at end of file +// REF: of testing.jj.JavaBase.getSome() +// REF: of testing.jj.JavaBase.setSome(String) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/resolve/referenceWithLib/overridingFunctionWithSamAdapter.kt b/plugins/kotlin/idea/tests/testData/resolve/referenceWithLib/overridingFunctionWithSamAdapter.kt index af6b13e1e2e2..b68aef958f2d 100644 --- a/plugins/kotlin/idea/tests/testData/resolve/referenceWithLib/overridingFunctionWithSamAdapter.kt +++ b/plugins/kotlin/idea/tests/testData/resolve/referenceWithLib/overridingFunctionWithSamAdapter.kt @@ -10,4 +10,4 @@ fun test(m: MyClass) { } } -// REF: (in test.Test).act(Action) \ No newline at end of file +// REF: of test.Test.act(Action) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/JavaAnnotationParameter.kt b/plugins/kotlin/idea/tests/testData/resolve/references/JavaAnnotationParameter.kt index a740785f725a..53a984e54b28 100644 --- a/plugins/kotlin/idea/tests/testData/resolve/references/JavaAnnotationParameter.kt +++ b/plugins/kotlin/idea/tests/testData/resolve/references/JavaAnnotationParameter.kt @@ -1,4 +1,4 @@ @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) annotation class Anno() -// REF: (in java.lang.annotation.Retention).value() \ No newline at end of file +// REF: of java.lang.annotation.Retention.value() \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/JavaConstructorNotNullParameter.kt b/plugins/kotlin/idea/tests/testData/resolve/references/JavaConstructorNotNullParameter.kt index 08c278cc6293..5ecf1d965dd1 100644 --- a/plugins/kotlin/idea/tests/testData/resolve/references/JavaConstructorNotNullParameter.kt +++ b/plugins/kotlin/idea/tests/testData/resolve/references/JavaConstructorNotNullParameter.kt @@ -4,4 +4,4 @@ class A { } } -// REF: (in JavaClass).JavaClass(String) +// REF: of JavaClass.JavaClass(String) diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/JavaEnumEntry.kt b/plugins/kotlin/idea/tests/testData/resolve/references/JavaEnumEntry.kt index 1be2153ec098..10155fb1e42e 100644 --- a/plugins/kotlin/idea/tests/testData/resolve/references/JavaEnumEntry.kt +++ b/plugins/kotlin/idea/tests/testData/resolve/references/JavaEnumEntry.kt @@ -1,4 +1,4 @@ @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) annotation class Anno() -// REF: (in java.lang.annotation.RetentionPolicy).RUNTIME \ No newline at end of file +// REF: of java.lang.annotation.RetentionPolicy.RUNTIME \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/ReferenceToSam.kt b/plugins/kotlin/idea/tests/testData/resolve/references/ReferenceToSam.kt index b70bbf853b6e..fa33b55ac231 100644 --- a/plugins/kotlin/idea/tests/testData/resolve/references/ReferenceToSam.kt +++ b/plugins/kotlin/idea/tests/testData/resolve/references/ReferenceToSam.kt @@ -3,4 +3,4 @@ fun some() { jClass.setListener {} } -// REF: (in JavaTest.SomeJavaClass).setListener(SAMInterface) +// REF: of JavaTest.SomeJavaClass.setListener(SAMInterface) diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/SamAdapter.kt b/plugins/kotlin/idea/tests/testData/resolve/references/SamAdapter.kt index 6e4f6f192041..4d54c00bbaf0 100644 --- a/plugins/kotlin/idea/tests/testData/resolve/references/SamAdapter.kt +++ b/plugins/kotlin/idea/tests/testData/resolve/references/SamAdapter.kt @@ -1,3 +1,3 @@ val c = java.util.concurrent.Executors.newFixedThreadPool(1).submit { } -// REF: (in java.util.concurrent.ExecutorService).submit(Runnable) \ No newline at end of file +// REF: of java.util.concurrent.ExecutorService.submit(Runnable) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/SyntheticProperty.kt b/plugins/kotlin/idea/tests/testData/resolve/references/SyntheticProperty.kt index 1a1cfa017d30..37cd7e4ab83a 100644 --- a/plugins/kotlin/idea/tests/testData/resolve/references/SyntheticProperty.kt +++ b/plugins/kotlin/idea/tests/testData/resolve/references/SyntheticProperty.kt @@ -12,17 +12,17 @@ fun JavaClass.foo(javaClass: JavaClass) { } // MULTIRESOLVE -// REF1: (in JavaClass).getSomething() -// REF2: (in JavaClass).setSomething(int) -// REF3: (in JavaClass).getSomething() -// REF3: (in JavaClass).setSomething(int) -// REF4: (in JavaClass).getSomething() -// REF4: (in JavaClass).setSomething(int) -// REF5: (in JavaClass).getSomething() -// REF5: (in JavaClass).setSomething(int) -// REF6: (in JavaClass).getSomething() -// REF6: (in JavaClass).setSomething(int) -// REF7: (in JavaClass).getSomething() -// REF7: (in JavaClass).setSomething(int) -// REF8: (in JavaClass).setSomething(int) -// REF9: (in JavaClass).setSomething(int) +// REF1: of JavaClass.getSomething() +// REF2: of JavaClass.setSomething(int) +// REF3: of JavaClass.getSomething() +// REF3: of JavaClass.setSomething(int) +// REF4: of JavaClass.getSomething() +// REF4: of JavaClass.setSomething(int) +// REF5: of JavaClass.getSomething() +// REF5: of JavaClass.setSomething(int) +// REF6: of JavaClass.getSomething() +// REF6: of JavaClass.setSomething(int) +// REF7: of JavaClass.getSomething() +// REF7: of JavaClass.setSomething(int) +// REF8: of JavaClass.setSomething(int) +// REF9: of JavaClass.setSomething(int) diff --git a/plugins/kotlin/idea/tests/testData/script/definition/navigation/javaLib/script.kts b/plugins/kotlin/idea/tests/testData/script/definition/navigation/javaLib/script.kts index fc773231fed8..a7ee0990f92b 100644 --- a/plugins/kotlin/idea/tests/testData/script/definition/navigation/javaLib/script.kts +++ b/plugins/kotlin/idea/tests/testData/script/definition/navigation/javaLib/script.kts @@ -2,5 +2,5 @@ test.Utils.foo("asd") // DEPENDENCIES: classpath:lib-classes -// REF: (in test.Utils).foo(String) +// REF: of test.Utils.foo(String) // FILE: test/Utils.class \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/script/definition/navigation/javaLibWithSources/script.kts b/plugins/kotlin/idea/tests/testData/script/definition/navigation/javaLibWithSources/script.kts index 014e152a0e03..e5650d7dfba0 100644 --- a/plugins/kotlin/idea/tests/testData/script/definition/navigation/javaLibWithSources/script.kts +++ b/plugins/kotlin/idea/tests/testData/script/definition/navigation/javaLibWithSources/script.kts @@ -2,5 +2,5 @@ test.Utils.foo("asd") // DEPENDENCIES: classpath:lib-classes; sources:lib-source -// REF: (in test.Utils).foo(String) +// REF: of test.Utils.foo(String) // FILE: test/Utils.java \ No newline at end of file