From a5cecd6048936d010e305bbd93d83f8974c28126 Mon Sep 17 00:00:00 2001
From: Jack Zhou <yz282@cornell.edu>
Date: Sat, 9 Feb 2013 00:48:25 -0500
Subject: [PATCH] Added quickfix for VAR_OVERRIDDEN_BY_VAL.

---
 .../src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java | 1 +
 .../variables/changeMutability/afterValOverrideVar.kt     | 8 ++++++++
 .../variables/changeMutability/beforeValOverrideVar.kt    | 8 ++++++++
 .../jet/plugin/quickfix/QuickFixTestGenerated.java        | 5 +++++
 4 files changed, 22 insertions(+)
 create mode 100644 idea/testData/quickfix/variables/changeMutability/afterValOverrideVar.kt
 create mode 100644 idea/testData/quickfix/variables/changeMutability/beforeValOverrideVar.kt

diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
index 6d8ca6af889..c3cbda0041e 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
@@ -144,6 +144,7 @@ public class QuickFixes {
         ChangeVariableMutabilityFix changeVariableMutabilityFix = new ChangeVariableMutabilityFix();
         actions.put(VAL_WITH_SETTER, changeVariableMutabilityFix);
         actions.put(VAL_REASSIGNMENT, changeVariableMutabilityFix);
+        actions.put(VAR_OVERRIDDEN_BY_VAL, changeVariableMutabilityFix);
 
         actions.put(UNNECESSARY_SAFE_CALL, ReplaceCallFix.toDotCallFromSafeCall());
         actions.put(UNSAFE_CALL, ReplaceCallFix.toSafeCall());
diff --git a/idea/testData/quickfix/variables/changeMutability/afterValOverrideVar.kt b/idea/testData/quickfix/variables/changeMutability/afterValOverrideVar.kt
new file mode 100644
index 00000000000..1bab64c3283
--- /dev/null
+++ b/idea/testData/quickfix/variables/changeMutability/afterValOverrideVar.kt
@@ -0,0 +1,8 @@
+// "Make variable mutable" "true"
+open class A {
+    open var x = 42;
+}
+
+class B : A() {
+    override var x: Int = 3;
+}
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/beforeValOverrideVar.kt b/idea/testData/quickfix/variables/changeMutability/beforeValOverrideVar.kt
new file mode 100644
index 00000000000..d1545e6d999
--- /dev/null
+++ b/idea/testData/quickfix/variables/changeMutability/beforeValOverrideVar.kt
@@ -0,0 +1,8 @@
+// "Make variable mutable" "true"
+open class A {
+    open var x = 42;
+}
+
+class B : A() {
+    override val<caret> x: Int = 3;
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
index 7cf0cf66228..14a02e72977 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
@@ -746,6 +746,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/variables/changeMutability"), Pattern.compile("^before(\\w+)\\.kt$"), true);
             }
             
+            @TestMetadata("beforeValOverrideVar.kt")
+            public void testValOverrideVar() throws Exception {
+                doTest("idea/testData/quickfix/variables/changeMutability/beforeValOverrideVar.kt");
+            }
+            
             @TestMetadata("beforeValReassignmentLocal.kt")
             public void testValReassignmentLocal() throws Exception {
                 doTest("idea/testData/quickfix/variables/changeMutability/beforeValReassignmentLocal.kt");