From 070923f03a32a5ace1129c51e3652c48134f707f Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 19 Apr 2016 20:17:02 +0300
Subject: [PATCH] Introduce Parameter: Fixed title of declaration chooser 
 #KT-11617 Fixed

---
 ChangeLog.md                                                | 1 +
 .../extractFunction/ExtractKotlinFunctionHandler.kt         | 1 +
 .../introduceParameter/KotlinIntroduceParameterHandler.kt   | 1 +
 .../introduceProperty/KotlinIntroducePropertyHandler.kt     | 1 +
 .../kotlin/idea/refactoring/introduce/introduceUtil.kt      | 6 ++++--
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index c081028d132..50f1e2bc605 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -32,6 +32,7 @@ Issues fixed:
 - [KT-11845](https://youtrack.jetbrains.com/issue/KT-11845) Fixed exception on attempt to find derived classes
 - [KT-11736](https://youtrack.jetbrains.com/issue/KT-11736) Fixed searching of Java usages for @JvmStatic properties and @JvmStatic @JvmOverloads functions
 - [KT-8817](https://youtrack.jetbrains.com/issue/KT-8817) Fixed rename of Java getters/setters through synthetic property references in Kotlin
+- [KT-11617](https://youtrack.jetbrains.com/issue/KT-11617) Fixed title of Introduce Parameter declaration chooser
 
 #### Debugger
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
index 5e35d8e4917..da6fdebc104 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
@@ -66,6 +66,7 @@ class ExtractKotlinFunctionHandler(
                 EXTRACT_FUNCTION,
                 editor,
                 file,
+                "Select target code block",
                 { elements, parent -> parent.getExtractionContainers(elements.size == 1, allContainersEnabled) },
                 continuation
         )
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
index fae65e4173a..31670c9bae1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
@@ -191,6 +191,7 @@ fun selectNewParameterContext(
             operationName = INTRODUCE_PARAMETER,
             editor = editor,
             file = file,
+            title = "Introduce parameter to declaration",
             getContainers = { elements, parent ->
                 val parents = parent.parents
                 val stopAt = (parent.parents.zip(parent.parents.drop(1)))
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt
index 80cd40505fa..edde8a735be 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt
@@ -57,6 +57,7 @@ class KotlinIntroducePropertyHandler(
                 INTRODUCE_PROPERTY,
                 editor,
                 file,
+                "Select target code block",
                 { elements, parent ->
                     parent.getExtractionContainers(strict = true, includeAll = true).filter { it is KtClassBody || (it is KtFile && !it.isScript) }
                 },
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt
index affd9e8f135..342186460f3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt
@@ -44,6 +44,7 @@ fun selectElementsWithTargetSibling(
         operationName: String,
         editor: Editor,
         file: KtFile,
+        title: String,
         getContainers: (elements: List<PsiElement>, commonParent: PsiElement) -> List<PsiElement>,
         continuation: (elements: List<PsiElement>, targetSibling: PsiElement) -> Unit
 ) {
@@ -66,13 +67,14 @@ fun selectElementsWithTargetSibling(
         continuation(elements, outermostParent)
     }
 
-    selectElementsWithTargetParent(operationName, editor, file, getContainers, ::onSelectionComplete)
+    selectElementsWithTargetParent(operationName, editor, file, title, getContainers, ::onSelectionComplete)
 }
 
 fun selectElementsWithTargetParent(
         operationName: String,
         editor: Editor,
         file: KtFile,
+        title: String,
         getContainers: (elements: List<PsiElement>, commonParent: PsiElement) -> List<PsiElement>,
         continuation: (elements: List<PsiElement>, targetParent: PsiElement) -> Unit
 ) {
@@ -94,7 +96,7 @@ fun selectElementsWithTargetParent(
         chooseContainerElementIfNecessary(
                 containers,
                 editor,
-                "Select target code block",
+                title,
                 true,
                 { it },
                 { continuation(elements, it) }