From 1ed1751b63dec3ef78bc9e1f69059e95c12648c0 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 31 Jul 2017 15:18:53 +0300
Subject: [PATCH] Report "Make <visibility>" for visibility fixes #KT-19274
 Fixed

(instead of "Add <visibility> modifier")
---
 idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt   | 2 +-
 .../quickfix/memberVisibilityCanBePrivate/constructorParam.kt   | 2 +-
 .../memberVisibilityCanBePrivate/constructorParam.kt.after      | 2 +-
 idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt | 2 +-
 .../quickfix/memberVisibilityCanBePrivate/internal.kt.after     | 2 +-
 .../quickfix/memberVisibilityCanBePrivate/noModifier.kt         | 2 +-
 .../quickfix/memberVisibilityCanBePrivate/noModifier.kt.after   | 2 +-
 .../testData/quickfix/memberVisibilityCanBePrivate/protected.kt | 2 +-
 .../quickfix/memberVisibilityCanBePrivate/protected.kt.after    | 2 +-
 idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt   | 2 +-
 .../quickfix/memberVisibilityCanBePrivate/public.kt.after       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
index f31836932da..cd2574e026d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
@@ -46,7 +46,7 @@ open class AddModifierFix(
 
     override fun getText(): String {
         val element = element ?: return ""
-        if (modifier in modalityModifiers) {
+        if (modifier in modalityModifiers || modifier in KtTokens.VISIBILITY_MODIFIERS) {
             return "Make ${getElementName(element)} ${modifier.value}"
         }
         return "Add '${modifier.value}' modifier"
diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt b/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt
index 74cc3e52f23..d8edc6f4023 100644
--- a/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt
+++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt
@@ -1,4 +1,4 @@
-// "Add 'private' modifier" "true"
+// "Make 'a' private" "true"
 class A(<caret>internal val a: String = "") {
     fun foo() {
         a
diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after b/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after
index d86fdda03d6..7a470eaf759 100644
--- a/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after
+++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after
@@ -1,4 +1,4 @@
-// "Add 'private' modifier" "true"
+// "Make 'a' private" "true"
 class A(private val a: String = "") {
     fun foo() {
         a
diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt b/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt
index 91b71a8b5f5..8bb4d464c8f 100644
--- a/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt
+++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt
@@ -1,4 +1,4 @@
-// "Add 'private' modifier" "true"
+// "Make 'a' private" "true"
 class A {
     <caret>internal val a = ""
 
diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after b/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after
index 2b55d40e35e..33cc4209db3 100644
--- a/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after
+++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after
@@ -1,4 +1,4 @@
-// "Add 'private' modifier" "true"
+// "Make 'a' private" "true"
 class A {
     private val a = ""
 
diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt b/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt
index 9ebbeb8aa10..e45acfa81cf 100644
--- a/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt
+++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt
@@ -1,4 +1,4 @@
-// "Add 'private' modifier" "true"
+// "Make 'a' private" "true"
 class A {
     val <caret>a = ""
 
diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after b/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after
index 2b55d40e35e..33cc4209db3 100644
--- a/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after
+++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after
@@ -1,4 +1,4 @@
-// "Add 'private' modifier" "true"
+// "Make 'a' private" "true"
 class A {
     private val a = ""
 
diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt b/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt
index 18fe40838fb..542838773c0 100644
--- a/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt
+++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt
@@ -1,4 +1,4 @@
-// "Add 'private' modifier" "true"
+// "Make 'a' private" "true"
 open class A {
     <caret>protected val a = ""
 
diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after b/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after
index c6aed13e015..e38d8e14bf7 100644
--- a/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after
+++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after
@@ -1,4 +1,4 @@
-// "Add 'private' modifier" "true"
+// "Make 'a' private" "true"
 open class A {
     private val a = ""
 
diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt b/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt
index 94c53abb8a9..e517e7f7450 100644
--- a/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt
+++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt
@@ -1,4 +1,4 @@
-// "Add 'private' modifier" "true"
+// "Make 'a' private" "true"
 class A {
     <caret>public val a = ""
 
diff --git a/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after b/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after
index 2b55d40e35e..33cc4209db3 100644
--- a/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after
+++ b/idea/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after
@@ -1,4 +1,4 @@
-// "Add 'private' modifier" "true"
+// "Make 'a' private" "true"
 class A {
     private val a = ""