From 5e613554eead0b4ea28d6fbc3dc0e7962956aa14 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Tue, 2 Apr 2019 16:10:36 +0700
Subject: [PATCH] Minor: refactoring ChangeMemberFunctionSignatureFix

---
 .../quickfix/ChangeMemberFunctionSignatureFix.kt  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.kt
index 7c74009c5ac..71d0eea8ebd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.kt
@@ -57,7 +57,7 @@ import java.util.*
  */
 class ChangeMemberFunctionSignatureFix private constructor(
     element: KtNamedFunction,
-    private val signatures: List<ChangeMemberFunctionSignatureFix.Signature>
+    private val signatures: List<Signature>
 ) : KotlinQuickFixAction<KtNamedFunction>(element) {
 
     init {
@@ -233,10 +233,8 @@ class ChangeMemberFunctionSignatureFix private constructor(
 
     override fun getText(): String {
         val single = signatures.singleOrNull()
-        return if (single != null)
-            "Change function signature to '${single.preview}'"
-        else
-            "Change function signature..."
+        return if (single != null) "Change function signature to '${single.preview}'"
+        else "Change function signature..."
     }
 
     override fun getFamilyName() = "Change function signature"
@@ -332,11 +330,14 @@ class ChangeMemberFunctionSignatureFix private constructor(
                     }
                 }
 
-                val newParameterList = function.valueParameterList!!.replace(patternFunction.valueParameterList!!) as KtParameterList
+                val newParameterList = patternFunction.valueParameterList?.let {
+                    function.valueParameterList?.replace(it)
+                } as KtParameterList
+                ShortenReferences.DEFAULT.process(newParameterList)
+
                 if (patternFunction.receiverTypeReference == null && function.receiverTypeReference != null) {
                     function.setReceiverTypeReference(null)
                 }
-                ShortenReferences.DEFAULT.process(newParameterList)
             }
         }