From 8938752cf9d195c46b48aabad6f300e8ef1067a2 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 22 Apr 2016 10:47:38 +0300
Subject: [PATCH] Make visible now suggests all possible visibilities

---
 .../kotlin/idea/quickfix/MakeVisibleFactory.kt   | 16 ++++++++--------
 .../privateMemberToPublicSingleFile.kt           |  6 ++++++
 .../privateMemberToPublicSingleFile.kt.after     |  6 ++++++
 .../idea/quickfix/QuickFixTestGenerated.java     |  6 ++++++
 4 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 idea/testData/quickfix/increaseVisibility/privateMemberToPublicSingleFile.kt
 create mode 100644 idea/testData/quickfix/increaseVisibility/privateMemberToPublicSingleFile.kt.after

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeVisibleFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeVisibleFactory.kt
index 0d374a6fbcf..4c7a956e449 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeVisibleFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeVisibleFactory.kt
@@ -32,21 +32,21 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
-object MakeVisibleFactory  : KotlinSingleIntentionActionFactory() {
-
-    override fun createAction(diagnostic: Diagnostic): IntentionAction? {
-        val element = diagnostic.psiElement as? KtElement ?: return null
+object MakeVisibleFactory  : KotlinIntentionActionsFactory() {
+    override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
+        val element = diagnostic.psiElement as? KtElement ?: return emptyList()
         val context = element.analyze(BodyResolveMode.PARTIAL)
         val usageModule = context.get(BindingContext.FILE_TO_PACKAGE_FRAGMENT, element.getContainingKtFile())?.module
 
         @Suppress("UNCHECKED_CAST")
         val factory = diagnostic.factory as DiagnosticFactory3<*, DeclarationDescriptor, *, DeclarationDescriptor>
-        val descriptor = factory.cast(diagnostic).c as? DeclarationDescriptorWithVisibility ?: return null
-        val declaration = DescriptorToSourceUtils.getSourceFromDescriptor(descriptor) as? KtModifierListOwner ?: return null
+        val descriptor = factory.cast(diagnostic).c as? DeclarationDescriptorWithVisibility ?: return emptyList()
+        val declaration = DescriptorToSourceUtils.getSourceFromDescriptor(descriptor) as? KtModifierListOwner ?: return emptyList()
 
         val module = DescriptorUtils.getContainingModule(descriptor)
-        val targetVisibility = if (module != usageModule || descriptor.visibility != PRIVATE) PUBLIC else INTERNAL
+        val targetVisibilities = if (module != usageModule || descriptor.visibility != PRIVATE) listOf(PUBLIC)
+                                 else listOf(PUBLIC, INTERNAL)
 
-        return ChangeVisibilityFix.create(declaration, descriptor, targetVisibility)
+        return targetVisibilities.mapNotNull { ChangeVisibilityFix.create(declaration, descriptor, it) }
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/increaseVisibility/privateMemberToPublicSingleFile.kt b/idea/testData/quickfix/increaseVisibility/privateMemberToPublicSingleFile.kt
new file mode 100644
index 00000000000..58bead6915c
--- /dev/null
+++ b/idea/testData/quickfix/increaseVisibility/privateMemberToPublicSingleFile.kt
@@ -0,0 +1,6 @@
+// "Make x public" "true"
+class First(private val x: Int)
+
+class Second(f: First) {
+    val y = f.<caret>x
+}
diff --git a/idea/testData/quickfix/increaseVisibility/privateMemberToPublicSingleFile.kt.after b/idea/testData/quickfix/increaseVisibility/privateMemberToPublicSingleFile.kt.after
new file mode 100644
index 00000000000..e514082b3d9
--- /dev/null
+++ b/idea/testData/quickfix/increaseVisibility/privateMemberToPublicSingleFile.kt.after
@@ -0,0 +1,6 @@
+// "Make x public" "true"
+class First(val x: Int)
+
+class Second(f: First) {
+    val y = f.x
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 2f5c37b9679..37e887dc76e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -4872,6 +4872,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest(fileName);
         }
 
+        @TestMetadata("privateMemberToPublicSingleFile.kt")
+        public void testPrivateMemberToPublicSingleFile() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/increaseVisibility/privateMemberToPublicSingleFile.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("protectedMemberToPublicSingleFile.kt")
         public void testProtectedMemberToPublicSingleFile() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/increaseVisibility/protectedMemberToPublicSingleFile.kt");