azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spring Support: Show autowiring candidates line markers for @Autowired-annotated constructors and constructor parameters

Browse Source 
#KT-12120 Fixed
This commit is contained in:
Alexey Sedunov
2016-05-17 20:09:15 +03:00
parent 2bd03fe9b0
commit 26be254fbe
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt
+6 -2
View File
@@ -50,7 +50,11 @@ class KotlinSpringClassAnnotator : SpringClassAnnotator() {
}
return classForLightMethod?.toLightClass()?.methods?.firstOrNull { (it as? KtLightMethod)?.kotlinOrigin == function }
}
psiElement.getParentOfTypeAndBranch<KtConstructor<*>> { getConstructorKeyword() ?: getValueParameterList() }?.let {
return it.toLightMethods().firstOrNull()
}
psiElement.getParentOfTypeAndBranch<KtProperty> { nameIdentifier }?.let { return it }
psiElement.getParentOfTypeAndBranch<KtParameter> { nameIdentifier }?.let { if (it.valOrVarKeyword != null) return it }
psiElement.getParentOfTypeAndBranch<KtAnnotationEntry> {
(typeReference?.typeElement as? KtUserType)?.referenceExpression?.getReferencedNameElement()
}?.let { return it.toLightAnnotation() }
@@ -58,8 +62,8 @@ class KotlinSpringClassAnnotator : SpringClassAnnotator() {
}
private fun doCollectMarkers(psiElement: PsiElement, result: MutableCollection<in RelatedItemLineMarkerInfo<PsiElement>>?) {
if (psiElement is KtProperty) {
for (it in psiElement.toLightElements()) {
if (psiElement is KtProperty || psiElement is KtParameter) {
for (it in (psiElement as KtDeclaration).toLightElements()) {
val nameIdentifier = (it as? PsiNameIdentifierOwner)?.nameIdentifier ?: continue
super.collectNavigationMarkers(nameIdentifier, result)
}