From f84c5b0339b8a5e7306de26c68acdeeb73e400cb Mon Sep 17 00:00:00 2001
From: Dmitry Neverov <dmitry.neverov@gmail.com>
Date: Wed, 26 Apr 2017 06:22:14 +0200
Subject: [PATCH] Do not suggest 'Convert to secondary constructor' for
 annotation classes

 #KT-17408 Fixed
---
 .../ConvertPrimaryConstructorToSecondaryIntention.kt      | 8 ++++++--
 .../annotationClass.kt                                    | 3 +++
 .../kotlin/idea/intentions/IntentionTestGenerated.java    | 6 ++++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 idea/testData/intentions/convertPrimaryConstructorToSecondary/annotationClass.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
index 4b6c548a253..e934530c0fb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
@@ -40,8 +40,11 @@ class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingIntention<KtP
         KtPrimaryConstructor::class.java,
         "Convert to secondary constructor"
 ) {
-    override fun isApplicableTo(element: KtPrimaryConstructor, caretOffset: Int) =
-            element.containingClassOrObject is KtClass && element.valueParameters.all { !it.hasValOrVar() || it.annotationEntries.isEmpty() }
+    override fun isApplicableTo(element: KtPrimaryConstructor, caretOffset: Int): Boolean {
+        val containingClass = element.containingClassOrObject as? KtClass ?: return false
+        if (containingClass.isAnnotation()) return false;
+        return element.valueParameters.all { !it.hasValOrVar() || it.annotationEntries.isEmpty() }
+    }
 
     private fun KtReferenceExpression.isIndependent(classDescriptor: ClassDescriptor, context: BindingContext): Boolean {
         val referencedDescriptor = context[BindingContext.REFERENCE_TARGET, this] ?: return false
@@ -61,6 +64,7 @@ class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingIntention<KtP
 
     override fun applyTo(element: KtPrimaryConstructor, editor: Editor?) {
         val klass = element.containingClassOrObject as? KtClass ?: return
+        if (klass.isAnnotation()) return
         val context = klass.analyze()
         val factory = KtPsiFactory(klass)
         val commentSaver = CommentSaver(element)
diff --git a/idea/testData/intentions/convertPrimaryConstructorToSecondary/annotationClass.kt b/idea/testData/intentions/convertPrimaryConstructorToSecondary/annotationClass.kt
new file mode 100644
index 00000000000..e1306df3da3
--- /dev/null
+++ b/idea/testData/intentions/convertPrimaryConstructorToSecondary/annotationClass.kt
@@ -0,0 +1,3 @@
+// IS_APPLICABLE: false
+
+annotation class ValueMatters<caret>(val value: String)
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index a5838cfcae8..d0e53f6b17e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -5012,6 +5012,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("annotationClass.kt")
+        public void testAnnotationClass() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPrimaryConstructorToSecondary/annotationClass.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("defaultValueChain.kt")
         public void testDefaultValueChain() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPrimaryConstructorToSecondary/defaultValueChain.kt");