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

KotlinLanguageInjector: getNameReference extracted to work with annotations

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-02-28 14:01:30 +03:00
parent 08c41474af
commit fa1d2a891b
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt
+9 -16
View File
@@ -248,10 +248,7 @@ class KotlinLanguageInjector(
val argument = ktHost.parent as? KtValueArgument ?: return null
val callExpression = PsiTreeUtil.getParentOfType(ktHost, KtCallElement::class.java) ?: return null
var callee = callExpression.calleeExpression ?: return null
if (callee is KtConstructorCalleeExpression)
callee = callee.constructorReferenceExpression ?: return null
val callee = getNameReference(callExpression.calleeExpression) ?: return null
if (isAnalyzeOff()) return null
@@ -276,18 +273,19 @@ class KotlinLanguageInjector(
return null
}
private fun getNameReference(callee: KtExpression?): KtNameReferenceExpression? {
if (callee is KtConstructorCalleeExpression)
return callee.constructorReferenceExpression as? KtNameReferenceExpression
return callee as? KtNameReferenceExpression
}
private fun injectInAnnotationCall(host: KtElement): InjectionInfo? {
if (!annotationInjectionsEnabled) return null
val argument = host.parent as? KtValueArgument ?: return null
val annotationEntry = argument.parent.parent as? KtCallElement ?: return null
if (!fastCheckInjectionsExists(annotationEntry)) return null
val calleeExpression = annotationEntry.calleeExpression ?: return null
val calleeReference = when (calleeExpression) {
is KtConstructorCalleeExpression -> calleeExpression.constructorReferenceExpression?.mainReference // for top annotations
is KtNameReferenceExpression -> calleeExpression.mainReference // for nested annotations
else -> return null
}
val callee = calleeReference?.resolve()
val callee = getNameReference(calleeExpression)?.mainReference?.resolve()
when (callee) {
is PsiClass -> {
val psiClass = callee as? PsiClass ?: return null
@@ -386,12 +384,7 @@ class KotlinLanguageInjector(
}, false)
private fun fastCheckInjectionsExists(annotationEntry: KtCallElement): Boolean {
val referencedName = when (annotationEntry) {
is KtAnnotationEntry -> // for top annotations
(annotationEntry.typeReference?.typeElement as? KtUserType)?.referencedName ?: return false
else -> // for nested annotations
(annotationEntry.calleeExpression as? KtNameReferenceExpression)?.getReferencedName() ?: return false
}
val referencedName = getNameReference(annotationEntry.calleeExpression)?.getReferencedName() ?: return false
val annotationShortName = annotationEntry.containingKtFile.aliasImportMap()[referencedName].singleOrNull() ?: referencedName
return annotationShortName in injectableTargetClassShortNames.value
}