From e5841441c9a5b031022372c15cbab7a43c62ef1b Mon Sep 17 00:00:00 2001
From: kenji tomita <destinys.lotus.1108mn@gmail.com>
Date: Tue, 28 Aug 2018 13:49:38 +0900
Subject: [PATCH] Fix #KT-26353 'Make variable immutable' is a bad name for a
 quickfix that changes 'var' to 'val'

---
 .../kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt         | 2 +-
 idea/testData/quickfix/foldTryCatch/conditional.kt              | 2 +-
 idea/testData/quickfix/foldTryCatch/shadow.kt                   | 2 +-
 idea/testData/quickfix/lateinit/val.kt                          | 2 +-
 idea/testData/quickfix/lateinit/val.kt.after                    | 2 +-
 .../quickfix/variables/changeMutability/canBeVal/const.kt       | 2 +-
 .../quickfix/variables/changeMutability/canBeVal/const.kt.after | 2 +-
 .../variables/changeMutability/canBeVal/multiVariable.kt        | 2 +-
 .../variables/changeMutability/canBeVal/multiVariable.kt.after  | 2 +-
 .../variables/changeMutability/canBeVal/singleVariable.kt       | 2 +-
 .../variables/changeMutability/canBeVal/singleVariable.kt.after | 2 +-
 .../changeMutability/capturedMemberValInitialization.kt         | 2 +-
 .../changeMutability/capturedMemberValInitialization.kt.after   | 2 +-
 .../variables/changeMutability/capturedValInitialization.kt     | 2 +-
 .../changeMutability/capturedValInitialization.kt.after         | 2 +-
 .../quickfix/variables/changeMutability/funParameter.kt         | 2 +-
 .../quickfix/variables/changeMutability/localInGetter.kt        | 2 +-
 .../quickfix/variables/changeMutability/localInGetter.kt.after  | 2 +-
 .../quickfix/variables/changeMutability/valOverrideVar.kt       | 2 +-
 .../quickfix/variables/changeMutability/valOverrideVar.kt.after | 2 +-
 .../changeMutability/valOverrideVarConstructorParameter.kt      | 2 +-
 .../valOverrideVarConstructorParameter.kt.after                 | 2 +-
 .../quickfix/variables/changeMutability/valReassignmentLocal.kt | 2 +-
 .../variables/changeMutability/valReassignmentLocal.kt.after    | 2 +-
 .../variables/changeMutability/valReassignmentOuterDecl.kt      | 2 +-
 .../changeMutability/valReassignmentOuterDecl.kt.after          | 2 +-
 .../variables/changeMutability/valReassignmentProperty.kt       | 2 +-
 .../variables/changeMutability/valReassignmentProperty.kt.after | 2 +-
 .../valReassignmentPropertyConstructorParameter.kt              | 2 +-
 .../valReassignmentPropertyConstructorParameter.kt.after        | 2 +-
 .../quickfix/variables/changeMutability/valWithSetter.kt        | 2 +-
 .../quickfix/variables/changeMutability/valWithSetter.kt.after  | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt
index aa4778b3da7..03c85c09e2f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt
@@ -36,7 +36,7 @@ class ChangeVariableMutabilityFix(
     private val actionText: String? = null
 ) : KotlinQuickFixAction<KtValVarKeywordOwner>(element) {
 
-    override fun getText() = actionText ?: if (makeVar) "Make variable mutable" else "Make variable immutable"
+    override fun getText() = actionText ?: if (makeVar) "Change to var" else "Change to val"
 
     override fun getFamilyName(): String = text
 
diff --git a/idea/testData/quickfix/foldTryCatch/conditional.kt b/idea/testData/quickfix/foldTryCatch/conditional.kt
index 6afb729c8f1..112c5d5e130 100644
--- a/idea/testData/quickfix/foldTryCatch/conditional.kt
+++ b/idea/testData/quickfix/foldTryCatch/conditional.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.LiftAssignmentOutOfTryFix" "false"
-// ACTION: Make variable mutable
+// ACTION: Change to var
 // ERROR: Val cannot be reassigned
 // WITH_RUNTIME
 
diff --git a/idea/testData/quickfix/foldTryCatch/shadow.kt b/idea/testData/quickfix/foldTryCatch/shadow.kt
index 12363b51ad9..bcf80cf62df 100644
--- a/idea/testData/quickfix/foldTryCatch/shadow.kt
+++ b/idea/testData/quickfix/foldTryCatch/shadow.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.LiftAssignmentOutOfTryFix" "false"
-// ACTION: Make variable mutable
+// ACTION: Change to var
 // ERROR: Val cannot be reassigned
 // ERROR: Val cannot be reassigned
 // WITH_RUNTIME
diff --git a/idea/testData/quickfix/lateinit/val.kt b/idea/testData/quickfix/lateinit/val.kt
index 307674870fc..dfa0119c891 100644
--- a/idea/testData/quickfix/lateinit/val.kt
+++ b/idea/testData/quickfix/lateinit/val.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 
 class A() {
     <caret>lateinit val foo: String
diff --git a/idea/testData/quickfix/lateinit/val.kt.after b/idea/testData/quickfix/lateinit/val.kt.after
index 3853b8ebf97..10f4bff685f 100644
--- a/idea/testData/quickfix/lateinit/val.kt.after
+++ b/idea/testData/quickfix/lateinit/val.kt.after
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 
 class A() {
     <caret>lateinit var foo: String
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt
index 86aec666fd9..88df7842d27 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt
@@ -1,4 +1,4 @@
-// "Make variable immutable" "true"
+// "Change to val" "true"
 object Test {
     <caret>const var foo = "123"
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt.after b/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt.after
index 308af909133..9bdc2e4b909 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/const.kt.after
@@ -1,4 +1,4 @@
-// "Make variable immutable" "true"
+// "Change to val" "true"
 object Test {
     <caret>const val foo = "123"
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt
index 952389e35c9..e01f9a3d049 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt
@@ -1,4 +1,4 @@
-// "Make variable immutable" "true"
+// "Change to val" "true"
 fun foo(p: Int) {
     <caret>var (v1, v2) = getPair()!!
     v1
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after b/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after
index f0eb7a7ec9e..27188d60c38 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after
@@ -1,4 +1,4 @@
-// "Make variable immutable" "true"
+// "Change to val" "true"
 fun foo(p: Int) {
     <caret>val (v1, v2) = getPair()!!
     v1
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt b/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt
index 81a90c537f1..e5a59a76fc6 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt
@@ -1,4 +1,4 @@
-// "Make variable immutable" "true"
+// "Change to val" "true"
 fun foo(p: Int) {
     <caret>var v: Int
     if (p > 0) v = 1 else v = 2
diff --git a/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after b/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after
index 22c16345e99..a485bb36c39 100644
--- a/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after
@@ -1,4 +1,4 @@
-// "Make variable immutable" "true"
+// "Change to val" "true"
 fun foo(p: Int) {
     <caret>val v: Int
     if (p > 0) v = 1 else v = 2
diff --git a/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt b/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt
index 77a192d8031..3a3c160f4f1 100644
--- a/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt
+++ b/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 
 class Test {
     val a: String
diff --git a/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after b/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after
index 55a1aab8f72..e3c3d805144 100644
--- a/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 
 class Test {
     var a: String
diff --git a/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt b/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt
index 32fec5d064a..5e86b8120d6 100644
--- a/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt
+++ b/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 fun exec(f: () -> Unit) = f()
 
 fun foo() {
diff --git a/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after b/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after
index c7e2aafce69..3c3c5798e28 100644
--- a/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 fun exec(f: () -> Unit) = f()
 
 fun foo() {
diff --git a/idea/testData/quickfix/variables/changeMutability/funParameter.kt b/idea/testData/quickfix/variables/changeMutability/funParameter.kt
index e7500360ba4..16b28915729 100644
--- a/idea/testData/quickfix/variables/changeMutability/funParameter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/funParameter.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "false"
+// "Change to var" "false"
 // ACTION: Remove redundant assignment
 // ERROR: Val cannot be reassigned
 fun fun1(i: Int) {
diff --git a/idea/testData/quickfix/variables/changeMutability/localInGetter.kt b/idea/testData/quickfix/variables/changeMutability/localInGetter.kt
index 05398045207..15ebfa2cc70 100644
--- a/idea/testData/quickfix/variables/changeMutability/localInGetter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/localInGetter.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 
 val String.prop: Int
     get() {
diff --git a/idea/testData/quickfix/variables/changeMutability/localInGetter.kt.after b/idea/testData/quickfix/variables/changeMutability/localInGetter.kt.after
index 6a3a8d8765a..35667705288 100644
--- a/idea/testData/quickfix/variables/changeMutability/localInGetter.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/localInGetter.kt.after
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 
 val String.prop: Int
     get() {
diff --git a/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt b/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt
index d1545e6d999..a701f9af290 100644
--- a/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 open class A {
     open var x = 42;
 }
diff --git a/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt.after b/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt.after
index 1bab64c3283..59e2623f0a2 100644
--- a/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt.after
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 open class A {
     open var x = 42;
 }
diff --git a/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt b/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt
index 91246e33d4f..9fb43f04655 100644
--- a/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 open class A {
     open var x = 42;
 }
diff --git a/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt.after b/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt.after
index f56adb015c7..177bbb302e0 100644
--- a/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valOverrideVarConstructorParameter.kt.after
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 open class A {
     open var x = 42;
 }
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt
index ffda8c49743..a7c153f2b96 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 fun foo() {
     val a = 1
     <caret>a = 3
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after b/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after
index ce989c9eca4..4e36b226e2f 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 fun foo() {
     var a = 1
     <caret>a = 3
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt
index fcdd1c300a8..3cbca54a495 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 val a = 4
 
 fun bar() {
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after b/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after
index 915949f6cf5..bd6d3b89d12 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 var a = 4
 
 fun bar() {
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt
index 59988d60427..72822dad974 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 class A() {
     val a = 1
 
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after b/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after
index f8f28d3add5..5849ec160b2 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 class A() {
     var a = 1
 
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt
index 866d642f52c..29274224a93 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 class A(val a: Int) {
     fun foo() {
         <caret>a = 5
diff --git a/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after b/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after
index 33e426938fd..9fc90a40948 100644
--- a/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 class A(var a: Int) {
     fun foo() {
         a = 5
diff --git a/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt b/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt
index 8cd3efeb193..2ec0e97ae73 100644
--- a/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt
+++ b/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 class A() {
     val a: Int = 0
         <caret>set(v: Int) {}
diff --git a/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt.after b/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt.after
index 397ee7f8df9..93426374c12 100644
--- a/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt.after
+++ b/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt.after
@@ -1,4 +1,4 @@
-// "Make variable mutable" "true"
+// "Change to var" "true"
 class A() {
     var a: Int = 0
         set(v: Int) {}