From c1013cc198341f3550232f431fbdc7d9b5eaaf4c Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Wed, 26 Sep 2018 12:15:27 +0900
Subject: [PATCH] "Convert to secondary constructor": Fix false positive with
 delegation #KT-27061 Fixed

---
 .../ConvertPrimaryConstructorToSecondaryIntention.kt         | 3 ++-
 .../convertPrimaryConstructorToSecondary/delegation.kt       | 5 +++++
 .../kotlin/idea/intentions/IntentionTestGenerated.java       | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/intentions/convertPrimaryConstructorToSecondary/delegation.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
index 033ea866729..d360b47a11a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
@@ -42,7 +42,8 @@ class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingIntention<KtP
 ) {
     override fun isApplicableTo(element: KtPrimaryConstructor, caretOffset: Int): Boolean {
         val containingClass = element.containingClassOrObject as? KtClass ?: return false
-        if (containingClass.isAnnotation() || containingClass.isData()) return false;
+        if (containingClass.isAnnotation() || containingClass.isData()
+            || containingClass.superTypeListEntries.any { it is KtDelegatedSuperTypeEntry }) return false
         return element.valueParameters.all { !it.hasValOrVar() || it.annotationEntries.isEmpty() }
     }
 
diff --git a/idea/testData/intentions/convertPrimaryConstructorToSecondary/delegation.kt b/idea/testData/intentions/convertPrimaryConstructorToSecondary/delegation.kt
new file mode 100644
index 00000000000..1a59e09254d
--- /dev/null
+++ b/idea/testData/intentions/convertPrimaryConstructorToSecondary/delegation.kt
@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+
+interface Base
+
+class Foo(<caret>s: String, b: Base): Base by b
\ 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 6b9f6ea1721..e8cb98175c7 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -5755,6 +5755,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/convertPrimaryConstructorToSecondary/defaultValueChain.kt");
         }
 
+        @TestMetadata("delegation.kt")
+        public void testDelegation() throws Exception {
+            runTest("idea/testData/intentions/convertPrimaryConstructorToSecondary/delegation.kt");
+        }
+
         @TestMetadata("enum.kt")
         public void testEnum() throws Exception {
             runTest("idea/testData/intentions/convertPrimaryConstructorToSecondary/enum.kt");