From ee9eb55b59fa1fe1802f1eae8655e4f24466209e Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Mon, 14 Dec 2015 12:32:44 +0300
Subject: [PATCH] Extract Function: Fix NPE on parameter disabling. Fix
 parameter swapping

---
 .../introduce/extractionEngine/ExtractableCodeDescriptor.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
index 21105854cbb..8e60a27c947 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
@@ -391,7 +391,7 @@ fun ExtractableCodeDescriptor.copy(
             originalContext,
             listOf(newName),
             newVisibility,
-            parameters.map { oldToNewParameters[it]!! },
+            oldToNewParameters.values.filter { it != newReceiver },
             newReceiver,
             typeParameters,
             newReplacementMap,