jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-04 00:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

when finding usages of parameter of annotation class primary constructor, search also for light method generated from that parameter

Browse Source 
#KT-9399 Fixed
This commit is contained in:
Dmitry Jemerov
2016-06-03 20:42:46 +02:00
parent 5161b6bfe0
commit 7e2ce2d4e0
7 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
View File

@@ -112,6 +112,13 @@ object LightClassUtil {
return getPsiMethodWrapper(function)
}
/**
* Returns the light method generated from the parameter of an annotation class.
*/
fun getLightClassMethod(parameter: KtParameter): PsiMethod? {
return getPsiMethodWrapper(parameter)
}
fun getLightClassMethods(function: KtFunction): List<PsiMethod> {
return getPsiMethodWrappers(function, true)
}

9
compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
View File

@@ -49,6 +49,7 @@ fun KtDeclaration.toLightElements(): List<PsiNamedElement> =
is KtParameter -> ArrayList<PsiNamedElement>().let { elements ->
toPsiParameters().toCollection(elements)
LightClassUtil.getLightClassPropertyMethods(this).toCollection(elements)
toAnnotationLightMethod()?.let { elements.add(it) }
elements
}
@@ -96,6 +97,14 @@ fun KtParameter.toPsiParameters(): Collection<PsiParameter> {
}
}
private fun KtParameter.toAnnotationLightMethod(): PsiMethod? {
val parent = ownerFunction as? KtPrimaryConstructor ?: return null
val containingClass = parent.getContainingClassOrObject()
if (!containingClass.isAnnotation()) return null
return LightClassUtil.getLightClassMethod(this)
}
fun KtTypeParameter.toPsiTypeParameters(): List<PsiTypeParameter> {
val paramList = getNonStrictParentOfType<KtTypeParameterList>()
if (paramList == null) return listOf()

1
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
View File

@@ -273,6 +273,7 @@ class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, ReferencesSearc
is KtParameter -> {
searchPropertyMethods(queryParameters, element)
runReadAction {
val componentFunctionDescriptor = element.dataClassComponentFunction()
if (componentFunctionDescriptor != null) {
val containingClass = element.getStrictParentOfType<KtClassOrObject>()?.toLightClass()

4
idea/testData/findUsages/kotlin/findParameterUsages/kotlinAnnotationConstructorParameterUsages.0.kt vendored Normal file
View File

@@ -0,0 +1,4 @@
// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
// OPTIONS: usages
annotation class KotlinAnnForJava(val <caret>p: String)

1
idea/testData/findUsages/kotlin/findParameterUsages/kotlinAnnotationConstructorParameterUsages.1.java vendored Normal file
View File

@@ -0,0 +1 @@
@KotlinAnnForJava(p = "a") public class JavaClassForKotlin {}

1
idea/testData/findUsages/kotlin/findParameterUsages/kotlinAnnotationConstructorParameterUsages.results.txt vendored Normal file
View File

@@ -0,0 +1 @@
Unclassified usage 1 @KotlinAnnForJava(p = "a") public class JavaClassForKotlin {}

6
idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
View File

@@ -804,6 +804,12 @@ public class FindUsagesTestGenerated extends AbstractFindUsagesTest {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findParameterUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
}
@TestMetadata("kotlinAnnotationConstructorParameterUsages.0.kt")
public void testKotlinAnnotationConstructorParameterUsages() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/kotlinAnnotationConstructorParameterUsages.0.kt");
doTest(fileName);
}
@TestMetadata("kotlinComponentFunctionParameterUsages.0.kt")
public void testKotlinComponentFunctionParameterUsages() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt");