From 78a7afe70ed109c226a0652bd694a4f82bfcad49 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 5 Nov 2013 13:53:17 +0400 Subject: [PATCH] FindUsagesTest: Add usages of extensions for functions declared in objects --- .../kotlinOverloadAndExtensionUsages2.0.kt | 23 +++++++++++++++++++ .../kotlinOverloadAndExtensionUsages2.1.kt | 13 +++++++++++ ...linOverloadAndExtensionUsages2.results.txt | 3 +++ .../JetFindUsagesTestGenerated.java | 5 ++++ 4 files changed, 44 insertions(+) create mode 100644 idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt create mode 100644 idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.1.kt create mode 100644 idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt new file mode 100644 index 00000000000..36ceefc800b --- /dev/null +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt @@ -0,0 +1,23 @@ +// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetNamedFunction +// OPTIONS: overloadUsages +trait X { + +} + +class A: X { + +} + +object O: A() { + fun foo() { + + } +} + +fun A.foo(s: String) { + +} + +fun X.foo(n: Int) { + +} diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.1.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.1.kt new file mode 100644 index 00000000000..74b11df216d --- /dev/null +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.1.kt @@ -0,0 +1,13 @@ +class B { + fun bar1(a: A) { + a.foo("") + } + + fun bar2(x: X) { + x.foo(0) + } + + fun bar3() { + O.foo() + } +} \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt new file mode 100644 index 00000000000..be31093399a --- /dev/null +++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt @@ -0,0 +1,3 @@ +Function call (11: 11) O.foo() +Function call (3: 11) a.foo("") +Function call (7: 11) x.foo(0) diff --git a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java index 1e597a9cc55..c14feb7437b 100644 --- a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java @@ -233,6 +233,11 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { doTest("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.0.kt"); } + @TestMetadata("kotlinOverloadAndExtensionUsages2.0.kt") + public void testKotlinOverloadAndExtensionUsages2() throws Exception { + doTest("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt"); + } + @TestMetadata("kotlinPrivateMethodUsages.0.kt") public void testKotlinPrivateMethodUsages() throws Exception { doTest("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt");