From 0d65a1b7895ed6bdc68f47cf4f6e5c90de251bc2 Mon Sep 17 00:00:00 2001
From: Wojciech Lopata <wlopata@gmail.com>
Date: Wed, 15 May 2013 20:25:34 +0200
Subject: [PATCH] Better text for ChangeVariableTypeFix

---
 .../jet/plugin/quickfix/ChangeVariableTypeFix.java         | 7 ++++++-
 .../afterChangeOverridingPropertyTypeToFunctionType.kt     | 2 +-
 .../afterPropertyReturnTypeMismatchOnOverride.kt           | 2 +-
 .../afterPropertyTypeMismatchOnOverrideIntLong.kt          | 2 +-
 .../afterPropertyTypeMismatchOnOverrideIntUnit.kt          | 2 +-
 .../beforeChangeOverridingPropertyTypeToFunctionType.kt    | 2 +-
 .../beforePropertyReturnTypeMismatchOnOverride.kt          | 2 +-
 .../beforePropertyTypeMismatchOnOverrideIntLong.kt         | 2 +-
 .../beforePropertyTypeMismatchOnOverrideIntUnit.kt         | 2 +-
 9 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
index c70d024f7a6..4df5e245e88 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
@@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingContextUtils;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.KotlinCacheManagerUtil;
@@ -48,7 +49,11 @@ public class ChangeVariableTypeFix extends JetIntentionAction<JetVariableDeclara
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("change.element.type", element.getName(), renderedType);
+        String propertyName = element.getName();
+        FqName fqName = JetPsiUtil.getFQName(element);
+        if (fqName != null) propertyName = fqName.asString();
+
+        return JetBundle.message("change.element.type", propertyName, renderedType);
     }
 
     @NotNull
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverridingPropertyTypeToFunctionType.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverridingPropertyTypeToFunctionType.kt
index dea0db239e9..8bd2d6f38b3 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverridingPropertyTypeToFunctionType.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverridingPropertyTypeToFunctionType.kt
@@ -1,4 +1,4 @@
-// "Change 'x' type to '(String) -> Int'" "true"
+// "Change 'B.x' type to '(String) -> Int'" "true"
 trait A {
     var x: (String) -> Int
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyReturnTypeMismatchOnOverride.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyReturnTypeMismatchOnOverride.kt
index 9dbb3cbe563..0f79cd40f9d 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyReturnTypeMismatchOnOverride.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyReturnTypeMismatchOnOverride.kt
@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'A.x' type to 'Int'" "true"
 trait X {
     val x: Int
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntLong.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntLong.kt
index e810c22a1ee..80d3b2e6a05 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntLong.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntLong.kt
@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'B.x' type to 'Int'" "true"
 abstract class A {
     abstract var x : Int
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntUnit.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntUnit.kt
index 8296b837504..f37ab4f9ff0 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntUnit.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntUnit.kt
@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'B.x' type to 'Int'" "true"
 abstract class A {
     abstract var x : Int
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverridingPropertyTypeToFunctionType.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverridingPropertyTypeToFunctionType.kt
index 86cf8bd43da..6a6b1155d01 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverridingPropertyTypeToFunctionType.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverridingPropertyTypeToFunctionType.kt
@@ -1,4 +1,4 @@
-// "Change 'x' type to '(String) -> Int'" "true"
+// "Change 'B.x' type to '(String) -> Int'" "true"
 trait A {
     var x: (String) -> Int
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyReturnTypeMismatchOnOverride.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyReturnTypeMismatchOnOverride.kt
index afd321e5cfa..4378d809f4a 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyReturnTypeMismatchOnOverride.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyReturnTypeMismatchOnOverride.kt
@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'A.x' type to 'Int'" "true"
 trait X {
     val x: Int
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntLong.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntLong.kt
index db0eabb5856..a70d8d74a05 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntLong.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntLong.kt
@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'B.x' type to 'Int'" "true"
 abstract class A {
     abstract var x : Int
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntUnit.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntUnit.kt
index 39289180da2..469a62099b0 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntUnit.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntUnit.kt
@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'B.x' type to 'Int'" "true"
 abstract class A {
     abstract var x : Int
 }