Change visibility fix message (quotes) + list of available actions in tests

2016-04-23 13:26:06 +03:00
parent 7e80575a08
commit d8e47bd520
49 changed files with 99 additions and 53 deletions
@@ -39,7 +39,7 @@ open class ChangeVisibilityFix(
        protected val visibilityModifier: KtModifierKeywordToken
 ) : KotlinQuickFixAction<KtModifierListOwner>(element) {

-    override fun getText() = "Make $elementName $visibilityModifier"
+    override fun getText() = "Make '$elementName' $visibilityModifier"
    override fun getFamilyName() = "Make $visibilityModifier"

    override fun invoke(project: Project, editor: Editor?, file: KtFile) {
@@ -1,7 +1,7 @@
-// "Make foo private" "false"
+// "Make 'foo' private" "false"
 // ACTION: Convert parameter to receiver
-// ACTION: Make Nested internal
-// ACTION: Make Nested public
+// ACTION: Make 'Nested' internal
+// ACTION: Make 'Nested' public
 // ACTION: Remove parameter 'arg'
 // ERROR: 'internal' function exposes its 'private' parameter type argument Nested
 // ERROR: Cannot access 'Nested': it is 'private' in 'Outer'
@@ -1,4 +1,5 @@
-// "Make foo private" "true"
+// "Make 'foo' private" "true"
+// ACTION: Make 'Data' public

 private data class Data(val x: Int)

@@ -1,4 +1,5 @@
-// "Make foo private" "true"
+// "Make 'foo' private" "true"
+// ACTION: Make 'Data' public

 private data class Data(val x: Int)

@@ -1,7 +1,7 @@
-// "Make foo private" "false"
+// "Make 'foo' private" "false"
 // ACTION: Convert receiver to parameter
-// ACTION: Make Private protected
-// ACTION: Make Private public
+// ACTION: Make 'Private' protected
+// ACTION: Make 'Private' public
 // ERROR: 'protected (in My)' member exposes its 'private' receiver type argument Private

 class Receiver<T>
@@ -1,4 +1,5 @@
-// "Make bar private" "true"
+// "Make 'bar' private" "true"
+// ACTION: Make 'Data' internal

 private data class Data(val x: Int)

@@ -1,4 +1,5 @@
-// "Make bar private" "true"
+// "Make 'bar' private" "true"
+// ACTION: Make 'Data' internal

 private data class Data(val x: Int)

@@ -1,4 +1,5 @@
-// "Make First private" "true"
+// "Make 'First' private" "true"
+// ACTION: Make 'Data' protected

 class Outer {
    private open class Data(val x: Int)
@@ -1,4 +1,5 @@
-// "Make First private" "true"
+// "Make 'First' private" "true"
+// ACTION: Make 'Data' protected

 class Outer {
    private open class Data(val x: Int)
@@ -1,4 +1,5 @@
-// "Make First private" "true"
+// "Make 'First' private" "true"
+// ACTION: Make 'Data' public

 private open class Data(val x: Int)

@@ -1,4 +1,5 @@
-// "Make First private" "true"
+// "Make 'First' private" "true"
+// ACTION: Make 'Data' public

 private open class Data(val x: Int)

@@ -1,4 +1,5 @@
-// "Make First private" "true"
+// "Make 'First' private" "true"
+// ACTION: Make 'Data' public

 class Other {
    internal open class Data(val x: Int)
@@ -1,4 +1,5 @@
-// "Make First private" "true"
+// "Make 'First' private" "true"
+// ACTION: Make 'Data' public

 class Other {
    internal open class Data(val x: Int)
@@ -1,4 +1,5 @@
-// "Make Derived internal" "true"
+// "Make 'Derived' internal" "true"
+// ACTION: Make 'Outer' public

 import Outer.Base

@@ -1,4 +1,5 @@
-// "Make Derived internal" "true"
+// "Make 'Derived' internal" "true"
+// ACTION: Make 'Outer' public

 import Outer.Base

@@ -1,4 +1,5 @@
-// "Make Derived private" "true"
+// "Make 'Derived' private" "true"
+// ACTION: Make 'Derived' internal

 import Outer.Base

@@ -1,4 +1,5 @@
-// "Make Derived private" "true"
+// "Make 'Derived' private" "true"
+// ACTION: Make 'Derived' internal

 import Outer.Base

@@ -1,4 +1,5 @@
-// "Make User internal" "true"
+// "Make 'User' internal" "true"
+// ACTION: Make 'InternalString' public

 internal open class InternalString

@@ -1,4 +1,5 @@
-// "Make User internal" "true"
+// "Make 'User' internal" "true"
+// ACTION: Make 'InternalString' public

 internal open class InternalString

@@ -1,4 +1,6 @@
-// "Make Nested internal" "true"
+// "Make 'Nested' internal" "true"
+// ACTION: Make 'Nested' public
+// ACTION: Make 'foo' private

 class Outer {
    private class Nested
@@ -1,4 +1,6 @@
-// "Make Nested internal" "true"
+// "Make 'Nested' internal" "true"
+// ACTION: Make 'Nested' public
+// ACTION: Make 'foo' private

 class Outer {
    internal class Nested
@@ -1,4 +1,5 @@
-// "Make Nested public" "true"
+// "Make 'Nested' public" "true"
+// ACTION: Make 'Nested' internal

 class Outer {
    private class Nested
@@ -1,4 +1,5 @@
-// "Make Nested public" "true"
+// "Make 'Nested' public" "true"
+// ACTION: Make 'Nested' internal

 class Outer {
    class Nested
@@ -1,4 +1,5 @@
-// "Make Data public" "true"
+// "Make 'Data' public" "true"
+// ACTION: Make 'foo' private

 private data class Data(val x: Int)

@@ -1,4 +1,5 @@
-// "Make Data public" "true"
+// "Make 'Data' public" "true"
+// ACTION: Make 'foo' private

 data class Data(val x: Int)

@@ -1,4 +1,6 @@
-// "Make Private protected" "true"
+// "Make 'Private' protected" "true"
+// ACTION: Make 'foo' private
+// ACTION: Make 'Private' public

 class Receiver<T>

@@ -1,4 +1,6 @@
-// "Make Private protected" "true"
+// "Make 'Private' protected" "true"
+// ACTION: Make 'foo' private
+// ACTION: Make 'Private' public

 class Receiver<T>

@@ -1,4 +1,6 @@
-// "Make Data internal" "true"
+// "Make 'Data' internal" "true"
+// ACTION: Make 'bar' private
+// ACTION: Make 'Data' public

 private data class Data(val x: Int)

@@ -1,4 +1,6 @@
-// "Make Data internal" "true"
+// "Make 'Data' internal" "true"
+// ACTION: Make 'bar' private
+// ACTION: Make 'Data' public

 internal data class Data(val x: Int)

@@ -1,4 +1,6 @@
-// "Make Data protected" "true"
+// "Make 'Data' protected" "true"
+// ACTION: Make 'First' private
+// ACTION: Make 'Data' public

 class Outer {
    private open class Data(val x: Int)
@@ -1,4 +1,6 @@
-// "Make Data protected" "true"
+// "Make 'Data' protected" "true"
+// ACTION: Make 'First' private
+// ACTION: Make 'Data' public

 class Outer {
    protected open class Data(val x: Int)
@@ -1,4 +1,5 @@
-// "Make Data public" "true"
+// "Make 'Data' public" "true"
+// ACTION: Make 'First' private

 private open class Data(val x: Int)

@@ -1,4 +1,5 @@
-// "Make Data public" "true"
+// "Make 'Data' public" "true"
+// ACTION: Make 'First' private

 open class Data(val x: Int)

@@ -1,4 +1,5 @@
-// "Make Data public" "true"
+// "Make 'Data' public" "true"
+// ACTION: Make 'First' private

 class Other {
    internal open class Data(val x: Int)
@@ -1,4 +1,5 @@
-// "Make Data public" "true"
+// "Make 'Data' public" "true"
+// ACTION: Make 'First' private

 class Other {
    open class Data(val x: Int)
@@ -1,4 +1,4 @@
-// "Make Data public" "true"
+// "Make 'Data' public" "true"

 class Other {
    private open class Data(val x: Int)
@@ -1,4 +1,4 @@
-// "Make Data public" "true"
+// "Make 'Data' public" "true"

 class Other {
    open class Data(val x: Int)
@@ -1,4 +1,5 @@
-// "Make Outer public" "true"
+// "Make 'Outer' public" "true"
+// ACTION: Make 'Derived' internal

 import Outer.Base

@@ -1,4 +1,5 @@
-// "Make Outer public" "true"
+// "Make 'Outer' public" "true"
+// ACTION: Make 'Derived' internal

 import Outer.Base

@@ -1,4 +1,6 @@
-// "Make InternalString public" "true"
+// "Make 'InternalString' public" "true"
+// ACTION: Make 'User' internal
+// ACTION: Make 'User' private

 internal open class InternalString

@@ -1,4 +1,6 @@
-// "Make InternalString public" "true"
+// "Make 'InternalString' public" "true"
+// ACTION: Make 'User' internal
+// ACTION: Make 'User' private

 open class InternalString

@@ -1,4 +1,4 @@
-// "Make x public" "true"
+// "Make 'x' public" "true"

 open class Base(protected open val x: Int)

@@ -1,4 +1,4 @@
-// "Make x public" "true"
+// "Make 'x' public" "true"

 open class Base(protected open val x: Int)

@@ -1,4 +1,4 @@
-// "Make x internal" "true"
+// "Make 'x' internal" "true"
 class First(private val x: Int)

 class Second(f: First) {
@@ -1,4 +1,4 @@
-// "Make x internal" "true"
+// "Make 'x' internal" "true"
 class First(internal val x: Int)

 class Second(f: First) {
@@ -1,4 +1,4 @@
-// "Make x public" "true"
+// "Make 'x' public" "true"
 class First(private val x: Int)

 class Second(f: First) {
@@ -1,4 +1,4 @@
-// "Make x public" "true"
+// "Make 'x' public" "true"
 class First(val x: Int)

 class Second(f: First) {
@@ -1,4 +1,4 @@
-// "Make x public" "true"
+// "Make 'x' public" "true"
 class First(protected val x: Int)

 class Second(f: First) {
@@ -1,4 +1,4 @@
-// "Make x public" "true"
+// "Make 'x' public" "true"
 class First(val x: Int)

 class Second(f: First) {