Extends range of change visibility intention #KT-14093 Fixed

idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt

@@ -56,14 +56,9 @@ open class ChangeVisibilityModifierIntention protected constructor(
 
         text = defaultText
 
-        val modifierElement = element.visibilityModifier()
-        if (modifierElement != null) {
-            return modifierElement.textRange
-        }
-
         val defaultRange = noModifierYetApplicabilityRange(element) ?: return null
 
-        if (element is KtPrimaryConstructor && defaultRange.isEmpty) {
+        if (element is KtPrimaryConstructor && defaultRange.isEmpty && element.visibilityModifier() == null) {
             text = "Make primary constructor ${modifier.value}" // otherwise it may be confusing
         }
 

idea/testData/intentions/changeVisibility/private/hasModifier1.kt

@@ -0,0 +1 @@
+internal anno<caret>tation class Ann

idea/testData/intentions/changeVisibility/private/hasModifier1.kt.after

@@ -0,0 +1 @@
+private anno<caret>tation class Ann

idea/testData/intentions/changeVisibility/private/hasModifier2.kt

@@ -0,0 +1 @@
+internal annotation cla<caret>ss Ann

idea/testData/intentions/changeVisibility/private/hasModifier2.kt.after

@@ -0,0 +1 @@
+private annotation cla<caret>ss Ann

idea/testData/intentions/changeVisibility/private/hasModifier3.kt

@@ -0,0 +1 @@
+anno<caret>tation internal class Ann

idea/testData/intentions/changeVisibility/private/hasModifier3.kt.after

@@ -0,0 +1 @@
+anno<caret>tation private class Ann

idea/testData/intentions/changeVisibility/private/hasModifier4.kt

@@ -0,0 +1 @@
+annotation internal cla<caret>ss Ann

idea/testData/intentions/changeVisibility/private/hasModifier4.kt.after

@@ -0,0 +1 @@
+annotation private cla<caret>ss Ann

idea/testData/quickfix/replaceJvmFieldWithConst/class.kt

@@ -1,6 +1,9 @@
 // "Replace '@JvmField' with 'const'" "false"
 // WITH_RUNTIME
 // ERROR: JvmField has no effect on a private property
+// ACTION: Make internal
+// ACTION: Make protected
+// ACTION: Make public
 // ACTION: Move to constructor
 // ACTION: Specify type explicitly
 class Foo {

idea/testData/quickfix/replaceJvmFieldWithConst/nonConstantInitializer.kt

@@ -1,6 +1,8 @@
 // "Replace '@JvmField' with 'const'" "false"
 // WITH_RUNTIME
 // ERROR: JvmField has no effect on a private property
+// ACTION: Make internal
+// ACTION: Make public
 // ACTION: Remove explicit type specification
 fun getText() = ""
 <caret>@JvmField private val text: String = getText()

idea/testData/quickfix/replaceJvmFieldWithConst/nullable.kt

@@ -1,5 +1,7 @@
 // "Replace '@JvmField' with 'const'" "false"
 // WITH_RUNTIME
 // ERROR: JvmField has no effect on a private property
+// ACTION: Make internal
+// ACTION: Make public
 // ACTION: Remove explicit type specification
 <caret>@JvmField private val number: Int? = 42

idea/testData/quickfix/replaceJvmFieldWithConst/stringTemplateWithVal.kt

@@ -2,6 +2,8 @@
 // WITH_RUNTIME
 // ERROR: JvmField has no effect on a private property
 // ACTION: Add 'const' modifier
+// ACTION: Make internal
+// ACTION: Make public
 // ACTION: Specify type explicitly
 val three = 3
 <caret>@JvmField private val text = "${2 + three}"

idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java

@@ -2974,6 +2974,30 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/private"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
             }
 
+            @TestMetadata("hasModifier1.kt")
+            public void testHasModifier1() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/hasModifier1.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("hasModifier2.kt")
+            public void testHasModifier2() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/hasModifier2.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("hasModifier3.kt")
+            public void testHasModifier3() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/hasModifier3.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("hasModifier4.kt")
+            public void testHasModifier4() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/hasModifier4.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("noModifierListAnnotation.kt")
             public void testNoModifierListAnnotation() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListAnnotation.kt");