From 181af17315c07c93eb63f59f852b25c117359605 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 12 May 2015 19:41:44 +0300
Subject: [PATCH] KT-7704 Intention actions on visibility modifier for quick
 changing it

 #KT-7704 Fixed
---
 .idea/codeStyleSettings.xml                   |   4 +-
 .../org/jetbrains/kotlin/psi/JetClass.java    |   6 +
 .../kotlin/psi/JetNamedFunction.java          |   2 +-
 .../jetbrains/kotlin/psi/addRemoveModifier.kt |  15 +-
 .../intentions/JetSelfTargetingIntention.kt   |   2 +
 .../after.kt.template                         |   4 +
 .../before.kt.template                        |   4 +
 .../description.html                          |   5 +
 .../after.kt.template                         |   4 +
 .../before.kt.template                        |   4 +
 .../description.html                          |   5 +
 .../after.kt.template                         |   4 +
 .../before.kt.template                        |   4 +
 .../description.html                          |   5 +
 .../after.kt.template                         |   4 +
 .../before.kt.template                        |   4 +
 .../description.html                          |   5 +
 idea/src/META-INF/plugin.xml                  |  28 ++-
 .../ChangeVisibilityModifierIntention.kt      | 121 +++++++++++
 .../ConvertFunctionToPropertyIntention.kt     |   2 +-
 .../ConvertPropertyToFunctionIntention.kt     |   2 +-
 .../changeVisibility/internal/.intention      |   1 +
 .../internal/internalByDefault.kt             |   4 +
 .../changeVisibility/internal/simple.kt       |   3 +
 .../changeVisibility/internal/simple.kt.after |   3 +
 .../changeVisibility/private/.intention       |   1 +
 .../private/noModifierListClass.kt            |   1 +
 .../private/noModifierListClass.kt.after      |   1 +
 .../private/noModifierListFun.kt              |   3 +
 .../private/noModifierListFun.kt.after        |   3 +
 .../private/noModifierListObject.kt           |   1 +
 .../private/noModifierListObject.kt.after     |   1 +
 .../noModifierListPrimaryConstructor.kt       |   2 +
 .../noModifierListPrimaryConstructor.kt.after |   2 +
 .../noModifierListSecondaryConstructor.kt     |   5 +
 ...oModifierListSecondaryConstructor.kt.after |   5 +
 .../private/noModifierListTrait.kt            |   1 +
 .../private/noModifierListTrait.kt.after      |   1 +
 .../private/noModifierListVal.kt              |   3 +
 .../private/noModifierListVal.kt.after        |   3 +
 .../private/noModifierListValParam.kt         |   1 +
 .../private/noModifierListValParam.kt.after   |   1 +
 .../private/notForAbstract.kt                 |   4 +
 .../changeVisibility/private/notForLocal.kt   |   4 +
 .../private/notForParameter.kt                |   2 +
 .../changeVisibility/private/simple.kt        |   3 +
 .../changeVisibility/private/simple.kt.after  |   3 +
 .../private/withAnnotations.kt                |   2 +
 .../private/withAnnotations.kt.after          |   2 +
 .../changeVisibility/protected/.intention     |   1 +
 .../changeVisibility/protected/noModifier.kt  |   3 +
 .../protected/noModifier.kt.after             |   3 +
 .../protected/notForObjectMember.kt           |   4 +
 .../protected/notForTopLevel.kt               |   2 +
 .../changeVisibility/protected/simple.kt      |   3 +
 .../protected/simple.kt.after                 |   3 +
 .../changeVisibility/public/.intention        |   1 +
 .../changeVisibility/public/alreadyPublic.kt  |   4 +
 .../changeVisibility/public/caretAfter.kt     |   3 +
 .../public/caretAfter.kt.after                |   3 +
 .../changeVisibility/public/notForOverride.kt |   8 +
 .../public/primaryConstructor.kt              |   2 +
 .../public/primaryConstructor.kt.after        |   2 +
 .../primaryConstructorPublicByDefault.kt      |   2 +
 .../changeVisibility/public/simple.kt         |   3 +
 .../changeVisibility/public/simple.kt.after   |   3 +
 .../intentions/IntentionTestGenerated.java    | 195 ++++++++++++++++++
 67 files changed, 532 insertions(+), 13 deletions(-)
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/after.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/before.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/description.html
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/after.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/before.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/description.html
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/after.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/before.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/description.html
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/after.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/before.kt.template
 create mode 100644 idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/description.html
 create mode 100644 idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
 create mode 100644 idea/testData/intentions/changeVisibility/internal/.intention
 create mode 100644 idea/testData/intentions/changeVisibility/internal/internalByDefault.kt
 create mode 100644 idea/testData/intentions/changeVisibility/internal/simple.kt
 create mode 100644 idea/testData/intentions/changeVisibility/internal/simple.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/private/.intention
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListClass.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListClass.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListFun.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListFun.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListObject.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListObject.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListPrimaryConstructor.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListPrimaryConstructor.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListTrait.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListTrait.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListVal.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListVal.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListValParam.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListValParam.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/private/notForAbstract.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/notForLocal.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/notForParameter.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/simple.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/simple.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/private/withAnnotations.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/withAnnotations.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/protected/.intention
 create mode 100644 idea/testData/intentions/changeVisibility/protected/noModifier.kt
 create mode 100644 idea/testData/intentions/changeVisibility/protected/noModifier.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/protected/notForObjectMember.kt
 create mode 100644 idea/testData/intentions/changeVisibility/protected/notForTopLevel.kt
 create mode 100644 idea/testData/intentions/changeVisibility/protected/simple.kt
 create mode 100644 idea/testData/intentions/changeVisibility/protected/simple.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/public/.intention
 create mode 100644 idea/testData/intentions/changeVisibility/public/alreadyPublic.kt
 create mode 100644 idea/testData/intentions/changeVisibility/public/caretAfter.kt
 create mode 100644 idea/testData/intentions/changeVisibility/public/caretAfter.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/public/notForOverride.kt
 create mode 100644 idea/testData/intentions/changeVisibility/public/primaryConstructor.kt
 create mode 100644 idea/testData/intentions/changeVisibility/public/primaryConstructor.kt.after
 create mode 100644 idea/testData/intentions/changeVisibility/public/primaryConstructorPublicByDefault.kt
 create mode 100644 idea/testData/intentions/changeVisibility/public/simple.kt
 create mode 100644 idea/testData/intentions/changeVisibility/public/simple.kt.after

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index e44675ffc8e..958fc092ada 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -270,6 +270,7 @@
         </codeStyleSettings>
         <codeStyleSettings language="XML">
           <indentOptions>
+            <option name="INDENT_SIZE" value="2" />
             <option name="CONTINUATION_INDENT_SIZE" value="4" />
             <option name="TAB_SIZE" value="8" />
           </indentOptions>
@@ -287,5 +288,4 @@
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java
index 7b27449a9dc..273e202d99c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java
@@ -22,6 +22,7 @@ import com.intellij.navigation.ItemPresentationProviders;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
@@ -255,4 +256,9 @@ public class JetClass extends JetTypeParameterListOwnerStub<KotlinClassStub> imp
         JetClassBody body = getBody();
         return body != null ? body.getSecondaryConstructors() : Collections.<JetSecondaryConstructor>emptyList();
     }
+
+    @Nullable
+    public PsiElement getClassOrTraitKeyword() {
+        return findChildByType(TokenSet.create(JetTokens.CLASS_KEYWORD, JetTokens.TRAIT_KEYWORD));
+    }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java
index 76220f1da6e..94245759a51 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java
@@ -79,7 +79,7 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub<KotlinFuncti
     }
 
     @NotNull
-    public PsiElement getFunToken() {
+    public PsiElement getFunKeyword() {
         PsiElement element = findChildByType(JetTokens.FUN_KEYWORD);
         assert element != null : "'fun' must be present: " + PsiUtilPackage.getElementTextWithContext(this);
         return element;
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
index 0e84c429e30..d77c4344d83 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
@@ -52,9 +52,7 @@ internal fun addModifier(modifierList: JetModifierList, modifier: JetModifierKey
 
     if (modifier == defaultVisibilityModifier) { // do not insert explicit 'internal' keyword (or 'public' for primary constructor)
         //TODO: code style option
-        if (modifierToReplace != null) {
-            modifierToReplace.delete()
-        }
+        modifierToReplace?.delete()
         return
     }
 
@@ -72,8 +70,17 @@ internal fun addModifier(modifierList: JetModifierList, modifier: JetModifierKey
             return newModifierOrder > order
         }
 
-        val anchor = modifierList.getLastChild()?.siblings(forward = false)?.firstOrNull(::placeAfter)
+        val lastChild = modifierList.getLastChild()
+        val anchor = lastChild?.siblings(forward = false)?.firstOrNull(::placeAfter)
         modifierList.addAfter(newModifier, anchor)
+
+        if (anchor == lastChild) { // add line break if needed, otherwise visibility keyword may appear on previous line
+            val whiteSpace = modifierList.getNextSibling() as? PsiWhiteSpace
+            if (whiteSpace != null && whiteSpace.getText().contains('\n')) {
+                modifierList.addAfter(whiteSpace, anchor)
+                whiteSpace.delete()
+            }
+        }
     }
 }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt
index 6aeaad8313a..c718b3beacc 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt
@@ -34,6 +34,8 @@ public abstract class JetSelfTargetingIntention<TElement : JetElement>(
         private val firstElementOfTypeOnly: Boolean = false
 ) : IntentionAction {
 
+    protected val defaultText: String = text
+
     protected fun setText(text: String) {
         this.text = text
     }
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/after.kt.template b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/after.kt.template
new file mode 100644
index 00000000000..900f2f3164b
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/after.kt.template
@@ -0,0 +1,4 @@
+class C {
+    <spot>internal</spot> fun foo() {
+    }
+}
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/before.kt.template b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/before.kt.template
new file mode 100644
index 00000000000..d578e0f44ab
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/before.kt.template
@@ -0,0 +1,4 @@
+class C {
+    <spot>private</spot> fun foo() {
+    }
+}
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/description.html b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/description.html
new file mode 100644
index 00000000000..2d0b162f60e
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionInternal/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+This intention changes declaration visibility modifier to 'internal'.
+</body>
+</html>
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/after.kt.template b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/after.kt.template
new file mode 100644
index 00000000000..d578e0f44ab
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/after.kt.template
@@ -0,0 +1,4 @@
+class C {
+    <spot>private</spot> fun foo() {
+    }
+}
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/before.kt.template b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/before.kt.template
new file mode 100644
index 00000000000..986661ced20
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/before.kt.template
@@ -0,0 +1,4 @@
+class C {
+    <spot>public</spot> fun foo() {
+    }
+}
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/description.html b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/description.html
new file mode 100644
index 00000000000..693a3a58a7f
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPrivate/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+This intention changes declaration visibility modifier to 'private'.
+</body>
+</html>
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/after.kt.template b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/after.kt.template
new file mode 100644
index 00000000000..46a8b766d19
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/after.kt.template
@@ -0,0 +1,4 @@
+class C {
+    <spot>protected</spot> fun foo() {
+    }
+}
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/before.kt.template b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/before.kt.template
new file mode 100644
index 00000000000..d578e0f44ab
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/before.kt.template
@@ -0,0 +1,4 @@
+class C {
+    <spot>private</spot> fun foo() {
+    }
+}
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/description.html b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/description.html
new file mode 100644
index 00000000000..27963af5a27
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionProtected/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+This intention changes declaration visibility modifier to 'protected'.
+</body>
+</html>
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/after.kt.template b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/after.kt.template
new file mode 100644
index 00000000000..986661ced20
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/after.kt.template
@@ -0,0 +1,4 @@
+class C {
+    <spot>public</spot> fun foo() {
+    }
+}
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/before.kt.template b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/before.kt.template
new file mode 100644
index 00000000000..d578e0f44ab
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/before.kt.template
@@ -0,0 +1,4 @@
+class C {
+    <spot>private</spot> fun foo() {
+    }
+}
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/description.html b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/description.html
new file mode 100644
index 00000000000..2b91da703ab
--- /dev/null
+++ b/idea/resources/intentionDescriptions/ChangeVisibilityModifierIntentionPublic/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+This intention changes declaration visibility modifier to 'public'.
+</body>
+</html>
\ No newline at end of file
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 507d53c1d1c..7f870aa28e0 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -875,11 +875,31 @@
       <category>Kotlin</category>
     </intentionAction>
 
+    <intentionAction>
+      <className>org.jetbrains.kotlin.idea.intentions.ChangeVisibilityModifierIntention$Public</className>
+      <category>Kotlin</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>org.jetbrains.kotlin.idea.intentions.ChangeVisibilityModifierIntention$Private</className>
+      <category>Kotlin</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>org.jetbrains.kotlin.idea.intentions.ChangeVisibilityModifierIntention$Protected</className>
+      <category>Kotlin</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>org.jetbrains.kotlin.idea.intentions.ChangeVisibilityModifierIntention$Internal</className>
+      <category>Kotlin</category>
+    </intentionAction>
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ExplicitGetInspection"
-        displayName="Explicit 'get'"
-        groupName="Kotlin"
-        enabledByDefault="false"
-        level="WEAK WARNING"
+                     displayName="Explicit 'get'"
+                     groupName="Kotlin"
+                     enabledByDefault="false"
+                     level="WEAK WARNING"
         />
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToElvisInspection"
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
new file mode 100644
index 00000000000..2b19b7b4c84
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.intentions
+
+import com.intellij.codeInsight.intention.HighPriorityAction
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.util.TextRange
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiModifier
+import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
+import org.jetbrains.kotlin.lexer.JetTokens
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.startOffset
+
+public open class ChangeVisibilityModifierIntention protected(
+        val modifier: JetModifierKeywordToken
+) : JetSelfTargetingRangeIntention<JetDeclaration>(javaClass(), "Make ${modifier.getValue()}") {
+
+    override fun applicabilityRange(element: JetDeclaration): TextRange? {
+        val modifierList = element.getModifierList()
+        if (modifierList?.hasModifier(modifier) ?: false) return null
+        if (modifierList?.hasModifier(JetTokens.OVERRIDE_KEYWORD) ?: false) return null
+
+        setText(defaultText)
+
+        val modifierToChange = modifierToChange(element)
+        if (modifierToChange != null) {
+            return modifierToChange.getTextRange()
+        }
+
+        val defaultRange = canAddVisibilityModifier(element) ?: return null
+
+        val defaultVisibility = if (element is JetPrimaryConstructor) JetTokens.PUBLIC_KEYWORD else JetTokens.INTERNAL_KEYWORD
+        if (modifier == defaultVisibility) return null
+
+        if (element is JetPrimaryConstructor && defaultRange.isEmpty()) {
+            setText("Make primary constructor ${modifier.getValue()}") // otherwise it may be confusing
+        }
+
+        return if (modifierList != null)
+            TextRange(modifierList.startOffset, defaultRange.getEndOffset()) //TODO: smaller range? now it includes annotations too
+        else
+            defaultRange
+    }
+
+    override fun applyTo(element: JetDeclaration, editor: Editor) {
+        val modifierToChange = modifierToChange(element)
+        if (modifierToChange != null) {
+            val newModifier = JetPsiFactory(element).createModifierList(modifier).getModifier(modifier)!!
+            modifierToChange.replace(newModifier)
+        }
+        else {
+            element.addModifier(modifier)
+        }
+    }
+
+    private fun modifierToChange(element: JetDeclaration): PsiElement? {
+        val modifierList = element.getModifierList() ?: return null
+        return JetTokens.VISIBILITY_MODIFIERS.getTypes()
+                       .asSequence()
+                       .map { modifierList.getModifier(it as JetModifierKeywordToken) }
+                       .firstOrNull { it != null } ?: return null
+    }
+
+    private fun canAddVisibilityModifier(declaration: JetDeclaration): TextRange? {
+        if (JetPsiUtil.isLocal(declaration)) return null
+        return when (declaration) {
+            is JetNamedFunction -> declaration.getFunKeyword().getTextRange()
+            is JetProperty -> declaration.getValOrVarNode().getTextRange()
+            is JetClass -> declaration.getClassOrTraitKeyword()?.getTextRange()
+            is JetObjectDeclaration -> declaration.getObjectKeyword().getTextRange()
+            is JetPrimaryConstructor -> declaration.getValueParameterList()?.let { TextRange.from(it.startOffset, 0) } //TODO: use constructor keyword if exist
+            is JetSecondaryConstructor -> declaration.getConstructorKeyword().getTextRange()
+            is JetParameter -> declaration.getValOrVarNode()?.getTextRange()
+            else -> null
+        }
+    }
+
+    public class Public : ChangeVisibilityModifierIntention(JetTokens.PUBLIC_KEYWORD), HighPriorityAction
+
+    public class Private : ChangeVisibilityModifierIntention(JetTokens.PRIVATE_KEYWORD), HighPriorityAction {
+        override fun applicabilityRange(element: JetDeclaration): TextRange? {
+            return if (canBePrivate(element)) super<ChangeVisibilityModifierIntention>.applicabilityRange(element) else null
+        }
+
+        private fun canBePrivate(declaration: JetDeclaration): Boolean {
+            if (declaration.getModifierList()?.hasModifier(JetTokens.ABSTRACT_KEYWORD) ?: false) return false
+            return true
+        }
+    }
+
+    public class Protected : ChangeVisibilityModifierIntention(JetTokens.PROTECTED_KEYWORD) {
+        override fun applicabilityRange(element: JetDeclaration): TextRange? {
+            return if (canBeProtected(element)) super.applicabilityRange(element) else null
+        }
+
+        private fun canBeProtected(declaration: JetDeclaration): Boolean {
+            var parent = declaration.getParent()
+            if (parent is JetClassBody) {
+                parent = parent.getParent()
+            }
+            return parent is JetClass
+        }
+    }
+
+    public class Internal : ChangeVisibilityModifierIntention(JetTokens.INTERNAL_KEYWORD)
+}
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
index 7ea196646a2..e5c2441e839 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
@@ -81,7 +81,7 @@ public class ConvertFunctionToPropertyIntention : JetSelfTargetingIntention<JetN
                 originalFunction.typeFqNameToAdd?.let { function.setTypeReference(psiFactory.createType(it)) }
             }
 
-            function.getFunToken().replace(propertySample.getValOrVarNode().getPsi())
+            function.getFunKeyword().replace(propertySample.getValOrVarNode().getPsi())
             function.getValueParameterList()?.delete()
             val insertAfter = (function.getEqualsToken() ?: function.getBodyExpression())
                     ?.siblings(forward = false, withItself = false)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
index 0dec646e764..c6e25ad2167 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
@@ -67,7 +67,7 @@ public class ConvertPropertyToFunctionIntention : JetSelfTargetingIntention<JetP
 
             val sampleFunction = psiFactory.createFunction("fun foo() {\n\n}");
 
-            property.getValOrVarNode().getPsi().replace(sampleFunction.getFunToken());
+            property.getValOrVarNode().getPsi().replace(sampleFunction.getFunKeyword());
             property.addAfter(psiFactory.createParameterList("()"), property.getNameIdentifier());
             if (property.getInitializer() == null) {
                 if (getter != null) {
diff --git a/idea/testData/intentions/changeVisibility/internal/.intention b/idea/testData/intentions/changeVisibility/internal/.intention
new file mode 100644
index 00000000000..a6364ab7bca
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/internal/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ChangeVisibilityModifierIntention$Internal
diff --git a/idea/testData/intentions/changeVisibility/internal/internalByDefault.kt b/idea/testData/intentions/changeVisibility/internal/internalByDefault.kt
new file mode 100644
index 00000000000..3df37c57a27
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/internal/internalByDefault.kt
@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+class C {
+    <caret>fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/internal/simple.kt b/idea/testData/intentions/changeVisibility/internal/simple.kt
new file mode 100644
index 00000000000..9b23049dc59
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/internal/simple.kt
@@ -0,0 +1,3 @@
+class C {
+    <caret>public fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/internal/simple.kt.after b/idea/testData/intentions/changeVisibility/internal/simple.kt.after
new file mode 100644
index 00000000000..93fa6039d83
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/internal/simple.kt.after
@@ -0,0 +1,3 @@
+class C {
+    <caret>internal fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/.intention b/idea/testData/intentions/changeVisibility/private/.intention
new file mode 100644
index 00000000000..c84d8a82ba9
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ChangeVisibilityModifierIntention$Private
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListClass.kt b/idea/testData/intentions/changeVisibility/private/noModifierListClass.kt
new file mode 100644
index 00000000000..d0462da2c53
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListClass.kt
@@ -0,0 +1 @@
+<caret>class C
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListClass.kt.after b/idea/testData/intentions/changeVisibility/private/noModifierListClass.kt.after
new file mode 100644
index 00000000000..b579d21c692
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListClass.kt.after
@@ -0,0 +1 @@
+<caret>private class C
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListFun.kt b/idea/testData/intentions/changeVisibility/private/noModifierListFun.kt
new file mode 100644
index 00000000000..b48f905d12d
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListFun.kt
@@ -0,0 +1,3 @@
+class C {
+    <caret>fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListFun.kt.after b/idea/testData/intentions/changeVisibility/private/noModifierListFun.kt.after
new file mode 100644
index 00000000000..311fd0eb2ae
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListFun.kt.after
@@ -0,0 +1,3 @@
+class C {
+    <caret>private fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListObject.kt b/idea/testData/intentions/changeVisibility/private/noModifierListObject.kt
new file mode 100644
index 00000000000..2ec322e2e47
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListObject.kt
@@ -0,0 +1 @@
+<caret>object O
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListObject.kt.after b/idea/testData/intentions/changeVisibility/private/noModifierListObject.kt.after
new file mode 100644
index 00000000000..4d6757b57be
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListObject.kt.after
@@ -0,0 +1 @@
+<caret>private object O
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListPrimaryConstructor.kt b/idea/testData/intentions/changeVisibility/private/noModifierListPrimaryConstructor.kt
new file mode 100644
index 00000000000..14037d5a882
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListPrimaryConstructor.kt
@@ -0,0 +1,2 @@
+// INTENTION_TEXT: Make primary constructor private
+class C<caret>(val v: Int)
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListPrimaryConstructor.kt.after b/idea/testData/intentions/changeVisibility/private/noModifierListPrimaryConstructor.kt.after
new file mode 100644
index 00000000000..bc74be1bd91
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListPrimaryConstructor.kt.after
@@ -0,0 +1,2 @@
+// INTENTION_TEXT: Make primary constructor private
+class C<caret> private (val v: Int)
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt b/idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt
new file mode 100644
index 00000000000..97b069c53fd
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt
@@ -0,0 +1,5 @@
+class C {
+    <caret>constructor() {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt.after b/idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt.after
new file mode 100644
index 00000000000..105ff0c7bd5
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt.after
@@ -0,0 +1,5 @@
+class C {
+    <caret>private constructor() {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListTrait.kt b/idea/testData/intentions/changeVisibility/private/noModifierListTrait.kt
new file mode 100644
index 00000000000..0abfd603091
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListTrait.kt
@@ -0,0 +1 @@
+<caret>trait I
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListTrait.kt.after b/idea/testData/intentions/changeVisibility/private/noModifierListTrait.kt.after
new file mode 100644
index 00000000000..211a91f411f
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListTrait.kt.after
@@ -0,0 +1 @@
+<caret>private trait I
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListVal.kt b/idea/testData/intentions/changeVisibility/private/noModifierListVal.kt
new file mode 100644
index 00000000000..3f6cb10e05e
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListVal.kt
@@ -0,0 +1,3 @@
+class C {
+    val<caret> v = 1
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListVal.kt.after b/idea/testData/intentions/changeVisibility/private/noModifierListVal.kt.after
new file mode 100644
index 00000000000..072b260fa81
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListVal.kt.after
@@ -0,0 +1,3 @@
+class C {
+    private val<caret> v = 1
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListValParam.kt b/idea/testData/intentions/changeVisibility/private/noModifierListValParam.kt
new file mode 100644
index 00000000000..ade3707d9c5
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListValParam.kt
@@ -0,0 +1 @@
+class C(<caret>val v: Int)
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListValParam.kt.after b/idea/testData/intentions/changeVisibility/private/noModifierListValParam.kt.after
new file mode 100644
index 00000000000..f3ee14baec7
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListValParam.kt.after
@@ -0,0 +1 @@
+class C(<caret>private val v: Int)
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/notForAbstract.kt b/idea/testData/intentions/changeVisibility/private/notForAbstract.kt
new file mode 100644
index 00000000000..d34cab91dec
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/notForAbstract.kt
@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+abstract class C {
+    <caret>public abstract fun foo()
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/notForLocal.kt b/idea/testData/intentions/changeVisibility/private/notForLocal.kt
new file mode 100644
index 00000000000..c1e65b7e5e9
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/notForLocal.kt
@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+fun foo() {
+    <caret>val v = 1
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/notForParameter.kt b/idea/testData/intentions/changeVisibility/private/notForParameter.kt
new file mode 100644
index 00000000000..cb681184f7e
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/notForParameter.kt
@@ -0,0 +1,2 @@
+// IS_APPLICABLE: false
+class C(<caret>v: Int)
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/simple.kt b/idea/testData/intentions/changeVisibility/private/simple.kt
new file mode 100644
index 00000000000..9b23049dc59
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/simple.kt
@@ -0,0 +1,3 @@
+class C {
+    <caret>public fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/simple.kt.after b/idea/testData/intentions/changeVisibility/private/simple.kt.after
new file mode 100644
index 00000000000..311fd0eb2ae
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/simple.kt.after
@@ -0,0 +1,3 @@
+class C {
+    <caret>private fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/withAnnotations.kt b/idea/testData/intentions/changeVisibility/private/withAnnotations.kt
new file mode 100644
index 00000000000..40f19f48f21
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/withAnnotations.kt
@@ -0,0 +1,2 @@
+@deprecated("a")
+<caret>class C
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/withAnnotations.kt.after b/idea/testData/intentions/changeVisibility/private/withAnnotations.kt.after
new file mode 100644
index 00000000000..b757d7b73d9
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/withAnnotations.kt.after
@@ -0,0 +1,2 @@
+@deprecated("a")
+private<caret> class C
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/protected/.intention b/idea/testData/intentions/changeVisibility/protected/.intention
new file mode 100644
index 00000000000..c709fcd3fc4
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/protected/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ChangeVisibilityModifierIntention$Protected
diff --git a/idea/testData/intentions/changeVisibility/protected/noModifier.kt b/idea/testData/intentions/changeVisibility/protected/noModifier.kt
new file mode 100644
index 00000000000..a80789a0c4d
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/protected/noModifier.kt
@@ -0,0 +1,3 @@
+abstract class C {
+    <caret>abstract fun foo()
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/protected/noModifier.kt.after b/idea/testData/intentions/changeVisibility/protected/noModifier.kt.after
new file mode 100644
index 00000000000..84c53651e70
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/protected/noModifier.kt.after
@@ -0,0 +1,3 @@
+abstract class C {
+    <caret>protected abstract fun foo()
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/protected/notForObjectMember.kt b/idea/testData/intentions/changeVisibility/protected/notForObjectMember.kt
new file mode 100644
index 00000000000..8b3b5cf1327
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/protected/notForObjectMember.kt
@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+object O {
+    <caret>public fun foo(){}
+}
diff --git a/idea/testData/intentions/changeVisibility/protected/notForTopLevel.kt b/idea/testData/intentions/changeVisibility/protected/notForTopLevel.kt
new file mode 100644
index 00000000000..93e07a70eac
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/protected/notForTopLevel.kt
@@ -0,0 +1,2 @@
+// IS_APPLICABLE: false
+<caret>public fun String.foo(){}
diff --git a/idea/testData/intentions/changeVisibility/protected/simple.kt b/idea/testData/intentions/changeVisibility/protected/simple.kt
new file mode 100644
index 00000000000..9b23049dc59
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/protected/simple.kt
@@ -0,0 +1,3 @@
+class C {
+    <caret>public fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/protected/simple.kt.after b/idea/testData/intentions/changeVisibility/protected/simple.kt.after
new file mode 100644
index 00000000000..5489377a433
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/protected/simple.kt.after
@@ -0,0 +1,3 @@
+class C {
+    <caret>protected fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/public/.intention b/idea/testData/intentions/changeVisibility/public/.intention
new file mode 100644
index 00000000000..1ce7b13b041
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/public/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ChangeVisibilityModifierIntention$Public
diff --git a/idea/testData/intentions/changeVisibility/public/alreadyPublic.kt b/idea/testData/intentions/changeVisibility/public/alreadyPublic.kt
new file mode 100644
index 00000000000..f385b75b8e8
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/public/alreadyPublic.kt
@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+class C {
+    <caret>public fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/public/caretAfter.kt b/idea/testData/intentions/changeVisibility/public/caretAfter.kt
new file mode 100644
index 00000000000..ec9f94eb1e7
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/public/caretAfter.kt
@@ -0,0 +1,3 @@
+class C {
+    private<caret> fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/public/caretAfter.kt.after b/idea/testData/intentions/changeVisibility/public/caretAfter.kt.after
new file mode 100644
index 00000000000..16aa80d6512
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/public/caretAfter.kt.after
@@ -0,0 +1,3 @@
+class C {
+    public<caret> fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/public/notForOverride.kt b/idea/testData/intentions/changeVisibility/public/notForOverride.kt
new file mode 100644
index 00000000000..d2da67ec5bb
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/public/notForOverride.kt
@@ -0,0 +1,8 @@
+// IS_APPLICABLE: false
+// ERROR: Cannot weaken access privilege 'public' for 'foo' in 'T'
+trait T {
+    public fun foo()
+}
+abstract class C : T {
+    <caret>protected override fun foo() {}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/public/primaryConstructor.kt b/idea/testData/intentions/changeVisibility/public/primaryConstructor.kt
new file mode 100644
index 00000000000..322e8163e72
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/public/primaryConstructor.kt
@@ -0,0 +1,2 @@
+// INTENTION_TEXT: Make public
+class C <caret>private (val v: Int)
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/public/primaryConstructor.kt.after b/idea/testData/intentions/changeVisibility/public/primaryConstructor.kt.after
new file mode 100644
index 00000000000..8d6399bce6e
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/public/primaryConstructor.kt.after
@@ -0,0 +1,2 @@
+// INTENTION_TEXT: Make public
+class C <caret>public (val v: Int)
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/public/primaryConstructorPublicByDefault.kt b/idea/testData/intentions/changeVisibility/public/primaryConstructorPublicByDefault.kt
new file mode 100644
index 00000000000..717aae0de1d
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/public/primaryConstructorPublicByDefault.kt
@@ -0,0 +1,2 @@
+// IS_APPLICABLE: false
+class C<caret>(val v: Int)
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/public/simple.kt b/idea/testData/intentions/changeVisibility/public/simple.kt
new file mode 100644
index 00000000000..311fd0eb2ae
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/public/simple.kt
@@ -0,0 +1,3 @@
+class C {
+    <caret>private fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/public/simple.kt.after b/idea/testData/intentions/changeVisibility/public/simple.kt.after
new file mode 100644
index 00000000000..9b23049dc59
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/public/simple.kt.after
@@ -0,0 +1,3 @@
+class C {
+    <caret>public fun foo(){}
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 042a291eca4..f955c1205b8 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -1936,6 +1936,201 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
     }
 
+    @TestMetadata("idea/testData/intentions/changeVisibility")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ChangeVisibility extends AbstractIntentionTest {
+        public void testAllFilesPresentInChangeVisibility() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("idea/testData/intentions/changeVisibility/internal")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Internal extends AbstractIntentionTest {
+            public void testAllFilesPresentInInternal() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/internal"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("internalByDefault.kt")
+            public void testInternalByDefault() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/internal/internalByDefault.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/internal/simple.kt");
+                doTest(fileName);
+            }
+        }
+
+        @TestMetadata("idea/testData/intentions/changeVisibility/private")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Private extends AbstractIntentionTest {
+            public void testAllFilesPresentInPrivate() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/private"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("noModifierListClass.kt")
+            public void testNoModifierListClass() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListClass.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("noModifierListFun.kt")
+            public void testNoModifierListFun() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListFun.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("noModifierListObject.kt")
+            public void testNoModifierListObject() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListObject.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("noModifierListPrimaryConstructor.kt")
+            public void testNoModifierListPrimaryConstructor() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListPrimaryConstructor.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("noModifierListSecondaryConstructor.kt")
+            public void testNoModifierListSecondaryConstructor() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("noModifierListTrait.kt")
+            public void testNoModifierListTrait() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListTrait.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("noModifierListVal.kt")
+            public void testNoModifierListVal() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListVal.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("noModifierListValParam.kt")
+            public void testNoModifierListValParam() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListValParam.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("notForAbstract.kt")
+            public void testNotForAbstract() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/notForAbstract.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("notForLocal.kt")
+            public void testNotForLocal() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/notForLocal.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("notForParameter.kt")
+            public void testNotForParameter() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/notForParameter.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/simple.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("withAnnotations.kt")
+            public void testWithAnnotations() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/withAnnotations.kt");
+                doTest(fileName);
+            }
+        }
+
+        @TestMetadata("idea/testData/intentions/changeVisibility/protected")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Protected extends AbstractIntentionTest {
+            public void testAllFilesPresentInProtected() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/protected"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("noModifier.kt")
+            public void testNoModifier() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/noModifier.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("notForObjectMember.kt")
+            public void testNotForObjectMember() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/notForObjectMember.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("notForTopLevel.kt")
+            public void testNotForTopLevel() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/notForTopLevel.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/simple.kt");
+                doTest(fileName);
+            }
+        }
+
+        @TestMetadata("idea/testData/intentions/changeVisibility/public")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Public extends AbstractIntentionTest {
+            public void testAllFilesPresentInPublic() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/public"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+
+            @TestMetadata("alreadyPublic.kt")
+            public void testAlreadyPublic() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/alreadyPublic.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("caretAfter.kt")
+            public void testCaretAfter() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/caretAfter.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("notForOverride.kt")
+            public void testNotForOverride() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/notForOverride.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("primaryConstructor.kt")
+            public void testPrimaryConstructor() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/primaryConstructor.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("primaryConstructorPublicByDefault.kt")
+            public void testPrimaryConstructorPublicByDefault() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/primaryConstructorPublicByDefault.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/simple.kt");
+                doTest(fileName);
+            }
+        }
+    }
+
     @TestMetadata("idea/testData/intentions/conventionNameCalls")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)