From 35d104782eedb636e2861d504cf5c8176a2a507d Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 24 Oct 2016 20:34:40 +0300
Subject: [PATCH] Minor: primary constructor to secondary: do not specify
 independent property type explicitly

---
 .../ConvertPrimaryConstructorToSecondaryIntention.kt          | 2 +-
 .../independentProperty.kt.after                              | 2 +-
 .../independentProperty2.kt.after                             | 2 +-
 .../independentProperty3.kt.after                             | 2 +-
 .../initWithoutAssignments.kt.after                           | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
index 7eaa9cae82c..3d3fb3e74b3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
@@ -62,10 +62,10 @@ class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingIntention<KtP
         val commentSaver = CommentSaver(element)
         val initializerMap = mutableMapOf<KtProperty, String>()
         for (property in klass.getProperties()) {
+            if (property.isIndependent(klass, context)) continue
             if (property.typeReference == null) {
                 SpecifyTypeExplicitlyIntention().applyTo(property, editor)
             }
-            if (property.isIndependent(klass, context)) continue
             val initializer = property.initializer!!
             initializerMap[property] = initializer.text
             initializer.delete()
diff --git a/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty.kt.after b/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty.kt.after
index 78996a089ed..f369fdba066 100644
--- a/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty.kt.after
+++ b/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty.kt.after
@@ -6,7 +6,7 @@ class Hello {
         this.z = x + y
     }
 
-    val y: String = "Hello"
+    val y = "Hello"
 
     val z: String
 }
diff --git a/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty2.kt.after b/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty2.kt.after
index 0963f811db1..7275a807eb3 100644
--- a/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty2.kt.after
+++ b/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty2.kt.after
@@ -10,7 +10,7 @@ class Hello {
         this.z = x + y
     }
 
-    val y: String = Storage.hello
+    val y = Storage.hello
 
     val z: String
 }
diff --git a/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty3.kt.after b/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty3.kt.after
index d07f8e74a72..82fe3610f78 100644
--- a/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty3.kt.after
+++ b/idea/testData/intentions/convertPrimaryConstructorToSecondary/independentProperty3.kt.after
@@ -6,6 +6,6 @@ fun foo(x: Int) {
             this.y = y
         }
 
-        val z: Int = x
+        val z = x
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/convertPrimaryConstructorToSecondary/initWithoutAssignments.kt.after b/idea/testData/intentions/convertPrimaryConstructorToSecondary/initWithoutAssignments.kt.after
index a2342d287e2..a797bc5e20a 100644
--- a/idea/testData/intentions/convertPrimaryConstructorToSecondary/initWithoutAssignments.kt.after
+++ b/idea/testData/intentions/convertPrimaryConstructorToSecondary/initWithoutAssignments.kt.after
@@ -6,8 +6,8 @@ class My {
         println(y)
     }
 
-    val x: Int = 1
+    val x = 1
 
-    val y: Int = 2
+    val y = 2
 
 }
\ No newline at end of file