From d1958be2a8b0543e52b3a704d9a9f2f795d2b2bd Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 30 Sep 2016 11:23:46 +0300
Subject: [PATCH] KT-9839 related, secondary constructor to primary: comment
 restoration

(cherry picked from commit 998e39e)
---
 ...ConvertSecondaryConstructorToPrimaryIntention.kt | 12 ++++++++++--
 .../withComments.kt                                 | 13 +++++++++++++
 .../withComments.kt.after                           | 10 ++++++++++
 .../idea/intentions/IntentionTestGenerated.java     |  6 ++++++
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 idea/testData/intentions/convertSecondaryConstructorToPrimary/withComments.kt
 create mode 100644 idea/testData/intentions/convertSecondaryConstructorToPrimary/withComments.kt.after

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertSecondaryConstructorToPrimaryIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertSecondaryConstructorToPrimaryIntention.kt
index 2c4a228abda..b98772b1c47 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertSecondaryConstructorToPrimaryIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertSecondaryConstructorToPrimaryIntention.kt
@@ -20,6 +20,7 @@ import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully
+import org.jetbrains.kotlin.idea.util.CommentSaver
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
@@ -83,6 +84,7 @@ class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingIntention<KtS
         val context = klass.analyzeFully()
         val constructorDescriptor = context[BindingContext.CONSTRUCTOR, element] ?: return
         val factory = KtPsiFactory(klass)
+        val constructorCommentSaver = CommentSaver(element)
         val constructorInClass = klass.createPrimaryConstructorIfAbsent()
         val constructor = factory.createPrimaryConstructor(element.modifierList?.text?.replace("\n", " "))
         val parameterList = constructor.valueParameterList!!
@@ -105,10 +107,12 @@ class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingIntention<KtS
             val newParameter = factory.createParameter(parameter.text)
             val parameterDescriptor = context[BindingContext.VALUE_PARAMETER, parameter]
             val propertyDescriptor = parameterToPropertyMap[parameterDescriptor]
+            var propertyCommentSaver: CommentSaver? = null
             if (parameterDescriptor != null && propertyDescriptor != null) {
                 val property = DescriptorToSourceUtils.descriptorToDeclaration(propertyDescriptor) as? KtProperty
                 if (property != null) {
                     if (propertyDescriptor.name == parameterDescriptor.name && propertyDescriptor.type == parameterDescriptor.type) {
+                        propertyCommentSaver = CommentSaver(property)
                         val valOrVar = if (property.isVar) factory.createVarKeyword() else factory.createValKeyword()
                         newParameter.addBefore(valOrVar, newParameter.nameIdentifier)
                         val propertyModifiers = property.modifierList?.text
@@ -123,7 +127,9 @@ class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingIntention<KtS
                     }
                 }
             }
-            parameterList.addParameter(newParameter)
+            with (parameterList.addParameter(newParameter)) {
+                propertyCommentSaver?.restore(this)
+            }
         }
 
         val delegationCall = element.getDelegationCall()
@@ -140,7 +146,9 @@ class ConvertSecondaryConstructorToPrimaryIntention : SelfTargetingIntention<KtS
             }
         }
 
-        constructorInClass.replace(constructor)
+        with (constructorInClass.replace(constructor)) {
+            constructorCommentSaver.restore(this)
+        }
         element.delete()
         if ((initializer?.body as? KtBlockExpression)?.statements?.isNotEmpty() ?: false) {
             initializer?.let { klass.addDeclaration(it) }
diff --git a/idea/testData/intentions/convertSecondaryConstructorToPrimary/withComments.kt b/idea/testData/intentions/convertSecondaryConstructorToPrimary/withComments.kt
new file mode 100644
index 00000000000..fa10655a179
--- /dev/null
+++ b/idea/testData/intentions/convertSecondaryConstructorToPrimary/withComments.kt
@@ -0,0 +1,13 @@
+class WithComments {
+    /**
+     * A very important property
+     */
+    val veryImportant: Any
+
+    /**
+     * A constructor
+     */
+    constructor<caret>(/* Some parameter */veryImportant: Any) {
+        this.veryImportant = veryImportant
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/convertSecondaryConstructorToPrimary/withComments.kt.after b/idea/testData/intentions/convertSecondaryConstructorToPrimary/withComments.kt.after
new file mode 100644
index 00000000000..dcc3cce5813
--- /dev/null
+++ b/idea/testData/intentions/convertSecondaryConstructorToPrimary/withComments.kt.after
@@ -0,0 +1,10 @@
+class WithComments/* Some parameter */
+/**
+ * A constructor
+ */(
+        /**
+         * A very important property
+         */
+        val veryImportant: Any) {
+
+}
\ 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 b95aad17552..5392bdae553 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -4774,6 +4774,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("withComments.kt")
+        public void testWithComments() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertSecondaryConstructorToPrimary/withComments.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("withDelegation.kt")
         public void testWithDelegation() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertSecondaryConstructorToPrimary/withDelegation.kt");