From 93109c0d0ee64b2ae1276c5f8d95664f95ce3bcc Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Tue, 3 Oct 2017 11:54:48 +0300
Subject: [PATCH] Generate actual keyword for secondary constructors #KT-20008
 Fixed

---
 .../idea/quickfix/createImpl/CreateActualFix.kt      | 12 ++++++------
 .../multiModuleQuickFix/class/jvm/My.kt.after        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createImpl/CreateActualFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createImpl/CreateActualFix.kt
index c20f9ec27bd..9a57da9c3fd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createImpl/CreateActualFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createImpl/CreateActualFix.kt
@@ -253,15 +253,15 @@ private fun KtPsiFactory.generateFunction(
         }
     }
 
-    return if (expectedFunction is KtSecondaryConstructor) {
+    return (if (expectedFunction is KtSecondaryConstructor) {
         createSecondaryConstructor(expectedFunction.text + " " + body)
     }
     else {
-        createFunction(expectedFunction.text + " " + body).apply {
-            replaceExpectModifier(actualNeeded)
-            if (returnType != null && KotlinBuiltIns.isUnit(returnType)) {
-                typeReference = null
-            }
+        createFunction(expectedFunction.text + " " + body)
+    } as KtFunction).apply {
+        replaceExpectModifier(actualNeeded)
+        if (returnType != null && KotlinBuiltIns.isUnit(returnType)) {
+            typeReference = null
         }
     }
 }
diff --git a/idea/testData/multiModuleQuickFix/class/jvm/My.kt.after b/idea/testData/multiModuleQuickFix/class/jvm/My.kt.after
index 3f42c5e1cfd..a174aa97122 100644
--- a/idea/testData/multiModuleQuickFix/class/jvm/My.kt.after
+++ b/idea/testData/multiModuleQuickFix/class/jvm/My.kt.after
@@ -10,7 +10,7 @@ actual class My {
 
     actual fun baz() {}
 
-    constructor(flag: Boolean) {
+    actual constructor(flag: Boolean) {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }