From 792177f206fe4c9734a61b8caf1f66cbdf025316 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 26 Jul 2016 17:18:18 +0300 Subject: [PATCH] Extract Function: Extract Function: Fix generation of destructuring declarations #KT-13010 Fixed --- ChangeLog.md | 1 + .../refactoring/introduce/extractionEngine/extractorUtil.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index c7666155c1c..f393485f91c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -244,6 +244,7 @@ Using 'this' as function argument in constructor of non-final class - [`KT-12922`](https://youtrack.jetbrains.com/issue/KT-12922) Introduce Variable: Do not suggest expressions without type - [`KT-12943`](https://youtrack.jetbrains.com/issue/KT-12943) Rename: Show function signatures in "Rename Overloads" dialog - [`KT-13157`](https://youtrack.jetbrains.com/issue/KT-13157) Extract Function: Automatically quote function name if necessary +- [`KT-13010`](https://youtrack.jetbrains.com/issue/KT-13010) Extract Function: Fix generation of destructuring declarations ##### New features diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt index d6b1c7c546e..23a915e057e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt @@ -300,7 +300,7 @@ private fun makeCall( val entries = declarationsToMerge.map { p -> p.name + (p.typeReference?.let { ": ${it.text}" } ?: "") } anchorInBlock?.replace( - psiFactory.createDeclaration("${if (isVar) "var" else "val"} (${entries.joinToString()}) = $callText") + psiFactory.createDestructuringDeclaration("${if (isVar) "var" else "val"} (${entries.joinToString()}) = $callText") ) return