Make "Add annotation target" available on use-site annotation

So #KT-22861 Fixed
So #KT-22862 Fixed
This commit is contained in:
Toshiaki Kameyama
2018-02-28 14:36:32 +03:00
committed by Mikhail Glukhikh
parent 442a89bc6c
commit 963e430b42
25 changed files with 217 additions and 6 deletions
@@ -21,9 +21,11 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.search.searches.ReferencesSearch
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.project.languageVersionSettings
import org.jetbrains.kotlin.idea.search.restrictToKotlinSources
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
@@ -64,7 +66,8 @@ class AddAnnotationTargetFix(annotationEntry: KtAnnotationEntry) : KotlinQuickFi
override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtAnnotationEntry>? {
val entry = diagnostic.psiElement as? KtAnnotationEntry ?: return null
if (entry.toAnnotationClass() == null) return null
val annotationClass = entry.toAnnotationClass() ?: return null
if (entry.useSiteTarget != null && entry.getRequiredAnnotationTargets(annotationClass, entry.project).isEmpty()) return null
return AddAnnotationTargetFix(entry)
}
@@ -81,14 +84,29 @@ private fun KtAnnotationEntry.getRequiredAnnotationTargets(annotationClass: KtCl
}.flatten().toSet()
val annotationTargetValueNames = AnnotationTarget.values().map { it.name }
return (requiredTargets + otherReferenceRequiredTargets).filter { it.name in annotationTargetValueNames }
return (requiredTargets + otherReferenceRequiredTargets).distinct().filter { it.name in annotationTargetValueNames }
}
private fun KtAnnotationEntry.getActualTargetList(): List<KotlinTarget> {
val annotatedElement = getStrictParentOfType<KtModifierList>()?.owner as? KtElement
?: getStrictParentOfType<KtAnnotatedExpression>()?.baseExpression
?: getStrictParentOfType<KtFile>()
?: return emptyList()
return AnnotationChecker.getDeclarationSiteActualTargetList(annotatedElement, null, BindingTraceContext())
val targetList = AnnotationChecker.getActualTargetList(annotatedElement, null, BindingTraceContext())
if (useSiteTarget == null) {
return targetList.defaultTargets
}
val target = KotlinTarget.USE_SITE_MAPPING[useSiteTarget?.getAnnotationUseSiteTarget()] ?: return emptyList()
if (target !in with(targetList) { defaultTargets + canBeSubstituted + onlyWithUseSiteTarget }) return emptyList()
return if (target == KotlinTarget.RECEIVER &&
!languageVersionSettings.supportsFeature(LanguageFeature.RestrictionOfWrongAnnotationsWithUseSiteTargetsOnTypes)
) {
listOf(KotlinTarget.VALUE_PARAMETER)
} else {
listOf(target)
}
}
private fun KtClass.addAnnotationTargets(annotationTargets: List<KotlinTarget>, psiFactory: KtPsiFactory) {
@@ -507,7 +507,7 @@ class QuickFixRegistrar : QuickFixContributor {
RETURN_NOT_ALLOWED.registerFactory(ChangeToLabeledReturnFix)
WRONG_ANNOTATION_TARGET.registerFactory(AddAnnotationTargetFix)
WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET.registerFactory(MoveReceiverAnnotationFix)
WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET.registerFactory(MoveReceiverAnnotationFix, AddAnnotationTargetFix)
NO_CONSTRUCTOR.registerFactory(RemoveNoConstructorFix)