From f6b374f829189ca503bd6895e0f9a7a53f4affdd Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 2 Dec 2015 15:17:17 +0300
Subject: [PATCH] Inline Variable: Fix dialog text for non-local variables 
 #KT-6365 Fixed

---
 .../refactoring/inline/KotlinInlineValHandler.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java
index 759dcac2443..4c6801d5606 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java
@@ -150,7 +150,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
         if (canHighlight) {
             highlightExpressions(project, editor, referenceExpressions);
         }
-        if (!showDialog(project, name, referenceExpressions)) {
+        if (!showDialog(project, name, val, referenceExpressions)) {
             if (canHighlight) {
                 StatusBar statusBar = WindowManager.getInstance().getStatusBar(project);
                 if (statusBar != null) {
@@ -250,15 +250,20 @@ public class KotlinInlineValHandler extends InlineActionHandler {
         return result;
     }
 
-    private static boolean showDialog(Project project, String name, List<KtExpression> referenceExpressions) {
+    private static boolean showDialog(
+            Project project,
+            String name,
+            KtProperty property,
+            List<KtExpression> referenceExpressions
+    ) {
         if (ApplicationManager.getApplication().isUnitTestMode()) {
             return true;
         }
 
+        String kind = property.isLocal() ? "local variable" : "property";
         RefactoringMessageDialog dialog = new RefactoringMessageDialog(
                 RefactoringBundle.message("inline.variable.title"),
-                RefactoringBundle.message("inline.local.variable.prompt", name) + " " +
-                                  RefactoringBundle.message("occurences.string", referenceExpressions.size()),
+                "Inline " + kind + " '" + name + "'? " + RefactoringBundle.message("occurences.string", referenceExpressions.size()),
                 HelpID.INLINE_VARIABLE,
                 "OptionPane.questionIcon",
                 true,