From e937a350fe85f54dbc3889badf846369dff726ff Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 23 Mar 2018 14:52:02 +0300 Subject: [PATCH] Fix broken QF tests --- .../kotlin/idea/quickfix/AddAnnotationTargetFix.kt | 6 +++++- idea/testData/quickfix/addAnnotationTarget/fromLib.kt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt index 33caffbbf16..4da46c1e9e5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt @@ -15,6 +15,8 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Errors +import org.jetbrains.kotlin.diagnostics.Errors.WRONG_ANNOTATION_TARGET +import org.jetbrains.kotlin.diagnostics.Errors.WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.search.restrictToKotlinSources import org.jetbrains.kotlin.psi.* @@ -55,7 +57,9 @@ class AddAnnotationTargetFix(annotationEntry: KtAnnotationEntry) : KotlinQuickFi } override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction? { - if (diagnostic.factory != Errors.WRONG_ANNOTATION_TARGET) return null + if (diagnostic.factory != WRONG_ANNOTATION_TARGET && diagnostic.factory != WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET) { + return null + } val entry = diagnostic.psiElement as? KtAnnotationEntry ?: return null val annotationClass = entry.toAnnotationClass() ?: return null diff --git a/idea/testData/quickfix/addAnnotationTarget/fromLib.kt b/idea/testData/quickfix/addAnnotationTarget/fromLib.kt index 90e19e17f4e..791d8477675 100644 --- a/idea/testData/quickfix/addAnnotationTarget/fromLib.kt +++ b/idea/testData/quickfix/addAnnotationTarget/fromLib.kt @@ -3,6 +3,7 @@ // ACTION: Make internal // ACTION: Make private // ACTION: Specify type explicitly +// ACTION: Add use-site target 'property' // ERROR: This annotation is not applicable to target 'top level property without backing field or delegate' @JvmField