From 20784d50ff9db51e728ccd45afc955614b868050 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Fri, 11 Oct 2019 09:27:34 +0700
Subject: [PATCH] CallableBuilder: fix PIEAE #EA-214253 Fix

---
 .../createFromUsage/callableBuilder/CallableBuilder.kt    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index d941bdcfd80..a8dc3db5b36 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -445,6 +445,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
                     if (containingElement is KtBlockExpression && (callableInfo as? PropertyInfo)?.writable == true) {
                         originalElement as KtBinaryExpression
                     } else null
+                val pointerOfAssignmentToReplace = assignmentToReplace?.createSmartPointer()
 
                 val ownerTypeString = if (isExtension) {
                     val renderedType = receiverTypeCandidate!!.renderedTypes.first()
@@ -575,9 +576,10 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
                     }
                 }
 
-                if (assignmentToReplace != null) {
-                    (declaration as KtProperty).initializer = assignmentToReplace.right
-                    return assignmentToReplace.replace(declaration) as KtCallableDeclaration
+                val newInitializer = pointerOfAssignmentToReplace?.element
+                if (newInitializer != null) {
+                    (declaration as KtProperty).initializer = newInitializer.right
+                    return newInitializer.replace(declaration) as KtCallableDeclaration
                 }
 
                 val container = if (containingElement is KtClass && callableInfo.isForCompanion) {