From 395ba7d008de34c2c72c95d40bf3d7983429a30d Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 17 Mar 2020 19:16:14 +0200
Subject: [PATCH] Using new API

---
 ...linSuggestedRefactoringAvailability.kt.201 | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt.201 b/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt.201
index 8fef88def22..3bcd94f83d1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt.201
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/suggested/KotlinSuggestedRefactoringAvailability.kt.201
@@ -22,7 +22,7 @@ class KotlinSuggestedRefactoringAvailability(refactoringSupport: SuggestedRefact
 {
     override fun refineSignaturesWithResolve(state: SuggestedRefactoringState): SuggestedRefactoringState {
         val newDeclaration = state.declaration as? KtCallableDeclaration ?: return state
-        val oldDeclaration = state.createRestoredDeclarationCopy(refactoringSupport) as? KtCallableDeclaration ?: return state
+        val oldDeclaration = state.restoredDeclarationCopy() as? KtCallableDeclaration ?: return state
         oldDeclaration.containingKtFile.forcedModuleInfo = newDeclaration.getModuleInfo()
 
         val descriptorWithOldSignature = oldDeclaration.resolveToDescriptorIfAny() as CallableDescriptor
@@ -67,20 +67,13 @@ class KotlinSuggestedRefactoringAvailability(refactoringSupport: SuggestedRefact
             descriptorWithNewSignature.extensionReceiverParameter?.type
         )
 
-        return state.copy(
-            oldSignature = Signature.create(
-                oldSignature.name,
-                oldReturnType,
-                oldParameters,
-                oldAdditionalData?.copy(receiverType = oldReceiverType)
-            )!!,
-            newSignature = Signature.create(
-                newSignature.name,
-                newReturnType,
-                newParameters,
-                newAdditionalData?.copy(receiverType = newReceiverType)
-            )!!
-        )
+        return state
+            .withOldSignature(
+                Signature.create(oldSignature.name, oldReturnType, oldParameters, oldAdditionalData?.copy(receiverType = oldReceiverType))!!
+            )
+            .withNewSignature(
+                Signature.create(newSignature.name, newReturnType, newParameters, newAdditionalData?.copy(receiverType = newReceiverType))!!
+            )
     }
 
     private fun refineType(