From 8cb631d6f81be4b702e715b2d2458888fbe6237a Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 1 Oct 2014 14:52:30 +0400
Subject: [PATCH] Better way of changing property intiailizer used

---
 .../intentions/declarations/DeclarationUtils.java    | 12 ------------
 .../refactoring/extractFunction/extractorUtil.kt     |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
index 7150a5f9191..7d8b4eaaab7 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java
@@ -100,16 +100,4 @@ public class DeclarationUtils {
 
         return newInitializer;
     }
-
-    @NotNull
-    public static JetProperty changePropertyInitializer(@NotNull JetProperty property, @Nullable JetExpression initializer) {
-        //noinspection ConstantConditions
-        return JetPsiFactory(property).createProperty(
-                property.getNameIdentifier().getText(),
-                JetPsiUtil.getNullableText(property.getTypeRef()),
-                property.isVar(),
-                JetPsiUtil.getNullableText(initializer)
-        );
-    }
-
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt
index 43828eb2574..581503c6050 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt
@@ -304,7 +304,7 @@ private fun makeCall(
 
             is Initializer -> {
                 val newProperty = copiedDeclarations[outputValue.initializedDeclaration] as JetProperty
-                newProperty.replace(DeclarationUtils.changePropertyInitializer(newProperty, psiFactory.createExpression(callText)))
+                newProperty.setInitializer(psiFactory.createExpression(callText))
                 Collections.emptyList()
             }