diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt index 76279688256..a81569ac9fc 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt @@ -40,6 +40,7 @@ import org.jetbrains.jet.lang.psi.JetProperty import com.intellij.psi.PsiTypeParameter import org.jetbrains.jet.lang.psi.JetClassOrObject import com.intellij.psi.impl.light.LightTypeParameterListBuilder +import com.intellij.psi.search.SearchScope public class KotlinLightMethodForDeclaration( manager: PsiManager, override val delegate: PsiMethod, override val origin: JetDeclaration, containingClass: PsiClass @@ -106,4 +107,6 @@ public class KotlinLightMethodForDeclaration( override fun copy(): PsiElement { return KotlinLightMethodForDeclaration(getManager()!!, delegate, origin.copy() as JetDeclaration, getContainingClass()!!) } + + override fun getUseScope(): SearchScope = origin.getUseScope() } diff --git a/idea/testData/hierarchy/calls/callers/kotlinPrivateClass/KotlinPrivateClass_verification.xml b/idea/testData/hierarchy/calls/callers/kotlinPrivateClass/KotlinPrivateClass_verification.xml new file mode 100644 index 00000000000..efdac3ba3e9 --- /dev/null +++ b/idea/testData/hierarchy/calls/callers/kotlinPrivateClass/KotlinPrivateClass_verification.xml @@ -0,0 +1,3 @@ + + + diff --git a/idea/testData/hierarchy/calls/callers/kotlinPrivateClass/main0.kt b/idea/testData/hierarchy/calls/callers/kotlinPrivateClass/main0.kt new file mode 100644 index 00000000000..499eb78bcbc --- /dev/null +++ b/idea/testData/hierarchy/calls/callers/kotlinPrivateClass/main0.kt @@ -0,0 +1,9 @@ +open class Tester { + open fun test() { + val test = Test() + } + + private class Test { + + } +} \ No newline at end of file diff --git a/idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/KotlinPrivateFunction_verification.xml b/idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/KotlinPrivateFunction_verification.xml new file mode 100644 index 00000000000..9dabbf9afe1 --- /dev/null +++ b/idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/KotlinPrivateFunction_verification.xml @@ -0,0 +1,3 @@ + + + diff --git a/idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/main0.kt b/idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/main0.kt new file mode 100644 index 00000000000..38e02701a9c --- /dev/null +++ b/idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/main0.kt @@ -0,0 +1,9 @@ +open class Tester { + open fun test() { + privateTest() + } + + private fun privateTest() { + println(this) + } +} \ No newline at end of file diff --git a/idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/KotlinPrivateProperty_verification.xml b/idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/KotlinPrivateProperty_verification.xml new file mode 100644 index 00000000000..2a580ed4b05 --- /dev/null +++ b/idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/KotlinPrivateProperty_verification.xml @@ -0,0 +1,3 @@ + + + diff --git a/idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/main0.kt b/idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/main0.kt new file mode 100644 index 00000000000..a30adb97f38 --- /dev/null +++ b/idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/main0.kt @@ -0,0 +1,10 @@ +open class Tester { + open fun test() { + privateTest = "test" + println(privateTest) + } + + private var privateTest: String + get() = "" + set(value) { println(value) } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java index 9e1c1744bbd..b37c3b996b2 100644 --- a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java @@ -297,6 +297,21 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPackageProperty"); } + @TestMetadata("kotlinPrivateClass") + public void testKotlinPrivateClass() throws Exception { + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateClass"); + } + + @TestMetadata("kotlinPrivateFunction") + public void testKotlinPrivateFunction() throws Exception { + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateFunction"); + } + + @TestMetadata("kotlinPrivateProperty") + public void testKotlinPrivateProperty() throws Exception { + doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateProperty"); + } + @TestMetadata("kotlinProperty") public void testKotlinProperty() throws Exception { doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinProperty");