From daa1ac19187ec67af5cdd662b2671eac2c9d2eb5 Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Fri, 4 Sep 2015 23:49:10 +0300
Subject: [PATCH] fix tests in org.jetbrains.kotlin.idea.refactoring.introduce

---
 .../refactoring/extractFunction/basic/extensionFunForArray.kt | 2 +-
 .../extractFunction/basic/extensionFunForArray.kt.after       | 2 +-
 .../extractFunction/basic/localClassExtraction.kt.conflicts   | 2 +-
 .../extractFunction/basic/memberValUnderSmartCast.kt          | 3 ++-
 .../extractFunction/basic/memberValUnderSmartCast.kt.after    | 2 +-
 .../basic/memberValUnderSmartCastAndImplicitReceiver.kt       | 2 +-
 .../basic/memberValUnderSmartCastAndImplicitReceiver.kt.after | 2 +-
 .../extractFunction/basic/topLevelValUnderSmartCast.kt        | 2 +-
 .../extractFunction/basic/topLevelValUnderSmartCast.kt.after  | 2 +-
 .../refactoring/extractFunction/basic/traitFunction.kt.after  | 2 +-
 .../parameters/candidateTypes/receiverCandidateTypes.kt       | 2 +-
 .../parameters/candidateTypes/receiverCandidateTypes.kt.after | 2 +-
 .../parameters/extractThis/explicitThisInExtension.kt         | 2 +-
 .../parameters/extractThis/explicitThisInExtension.kt.after   | 2 +-
 .../parameters/extractThis/explicitThisWithSmartCast.kt       | 2 +-
 .../parameters/extractThis/explicitThisWithSmartCast.kt.after | 2 +-
 .../extractThis/implicitAndExplicitThisInExtension.kt         | 2 +-
 .../extractThis/implicitAndExplicitThisInExtension.kt.after   | 2 +-
 .../parameters/extractThis/implicitThisInExtension.kt         | 2 +-
 .../parameters/extractThis/implicitThisInExtension.kt.after   | 2 +-
 .../parameters/extractThis/implicitThisWithSmartCast.kt       | 2 +-
 .../parameters/extractThis/implicitThisWithSmartCast.kt.after | 2 +-
 .../extractFunction/parameters/extractThis/missingReceiver.kt | 2 +-
 .../parameters/extractThis/missingReceiver.kt.after           | 2 +-
 .../parameters/extractThis/qualifiedThisAsArgument.kt         | 4 ++--
 .../parameters/extractThis/qualifiedThisAsArgument.kt.after   | 4 ++--
 .../parameters/extractThis/thisAsExplicitInvoke.kt            | 2 +-
 .../parameters/extractThis/thisAsExplicitInvoke.kt.after      | 2 +-
 .../parameters/extractThis/thisAsImplicitInvoke.kt            | 2 +-
 .../parameters/extractThis/thisAsImplicitInvoke.kt.after      | 2 +-
 .../extractFunction/parameters/misc/addPrefixToBackticks.kt   | 4 ++--
 .../parameters/misc/addPrefixToBackticks.kt.after             | 4 ++--
 .../typeParameters/typeParameterNotResolvableInTargetScope.kt | 2 +-
 .../typeParameterNotResolvableInTargetScope.kt.after          | 2 +-
 .../typeParameters/typeParametersAndConstraintsCombined1.kt   | 4 ++--
 .../typeParametersAndConstraintsCombined1.kt.after            | 4 ++--
 .../typeParameters/typeParametersAndConstraintsCombined2.kt   | 2 +-
 .../typeParametersAndConstraintsCombined2.kt.after            | 2 +-
 .../extractFunction/typeParameters/typeParametersCombined1.kt | 4 ++--
 .../typeParameters/typeParametersCombined1.kt.after           | 4 ++--
 .../extractFunction/typeParameters/typeParametersCombined2.kt | 2 +-
 .../typeParameters/typeParametersCombined2.kt.after           | 2 +-
 .../typeParameters/typeParametersCombinedAndThis.kt           | 2 +-
 .../typeParameters/typeParametersCombinedAndThis.kt.after     | 2 +-
 44 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt
index d6e2121ad4f..8fbacf2d0b9 100644
--- a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt
+++ b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Array<T>, kotlin.Cloneable, Any
-// PARAM_DESCRIPTOR: internal fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
 // SIBLING:
 fun <T> Array<T>.test() {
     <selection>this.isEmpty()</selection>
diff --git a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after
index 7a981f7aa96..7d41728924a 100644
--- a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Array<T>, kotlin.Cloneable, Any
-// PARAM_DESCRIPTOR: internal fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
 // SIBLING:
 fun <T> Array<T>.test() {
     __dummyTestFun__()
diff --git a/idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt.conflicts b/idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt.conflicts
index 9e21861865b..ddf8bc12879 100644
--- a/idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt.conflicts
+++ b/idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt.conflicts
@@ -1 +1 @@
-Following declarations are used outside of selected code fragment:  public constructor A(n: Int = ...) value-parameter val n: Int = ...
\ No newline at end of file
+Following declarations are used outside of selected code fragment:  constructor A(n: Int = ...) value-parameter val n: Int = ...
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCast.kt b/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCast.kt
index bccd8158e34..8fe714659bb 100644
--- a/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCast.kt
+++ b/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCast.kt
@@ -1,6 +1,7 @@
+
 // SUGGESTED_NAMES: i, getKm
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: internal final val meters: kotlin.Int? defined in A
+// PARAM_DESCRIPTOR: public final val meters: kotlin.Int? defined in A
 class A {
     val meters: Int? = 1
 }
diff --git a/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCast.kt.after b/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCast.kt.after
index f3a760b8300..70c052c535b 100644
--- a/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCast.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCast.kt.after
@@ -1,6 +1,6 @@
 // SUGGESTED_NAMES: i, getKm
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: internal final val meters: kotlin.Int? defined in A
+// PARAM_DESCRIPTOR: public final val meters: kotlin.Int? defined in A
 class A {
     val meters: Int? = 1
 }
diff --git a/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCastAndImplicitReceiver.kt b/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCastAndImplicitReceiver.kt
index df99c7d3ff7..550894e9d21 100644
--- a/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCastAndImplicitReceiver.kt
+++ b/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCastAndImplicitReceiver.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // SUGGESTED_NAMES: i, getKm
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: internal final val meters: kotlin.Int? defined in A
+// PARAM_DESCRIPTOR: public final val meters: kotlin.Int? defined in A
 class A {
     val meters: Int? = 1
 }
diff --git a/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCastAndImplicitReceiver.kt.after b/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCastAndImplicitReceiver.kt.after
index 2963259b1ee..b1f49c77418 100644
--- a/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCastAndImplicitReceiver.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCastAndImplicitReceiver.kt.after
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // SUGGESTED_NAMES: i, getKm
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: internal final val meters: kotlin.Int? defined in A
+// PARAM_DESCRIPTOR: public final val meters: kotlin.Int? defined in A
 class A {
     val meters: Int? = 1
 }
diff --git a/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt b/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt
index 338e1844d79..7a8e30c1954 100644
--- a/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt
+++ b/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt
@@ -1,6 +1,6 @@
 // SUGGESTED_NAMES: i, getKm
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: internal val meters: kotlin.Int? defined in root package
+// PARAM_DESCRIPTOR: public val meters: kotlin.Int? defined in root package
 val meters: Int? = 1
 
 fun test() {
diff --git a/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt.after b/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt.after
index 6c7bc9f24e4..5f017440127 100644
--- a/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt.after
@@ -1,6 +1,6 @@
 // SUGGESTED_NAMES: i, getKm
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: internal val meters: kotlin.Int? defined in root package
+// PARAM_DESCRIPTOR: public val meters: kotlin.Int? defined in root package
 val meters: Int? = 1
 
 fun test() {
diff --git a/idea/testData/refactoring/extractFunction/basic/traitFunction.kt.after b/idea/testData/refactoring/extractFunction/basic/traitFunction.kt.after
index 7807b894d09..56a356b550a 100644
--- a/idea/testData/refactoring/extractFunction/basic/traitFunction.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/traitFunction.kt.after
@@ -3,5 +3,5 @@ interface T{
         return i()
     }
 
-    fun i() = 1
+    fun i(): Int = 1
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt
index 858338234d7..c65d064a7e8 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: internal fun Bar.foo(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun Bar.foo(): kotlin.Unit defined in root package
 // PARAM_TYPES: Bar, Foo, kotlin.Any
 
 open class Foo
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt.after
index 88bf1101481..1d2ae2eba86 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt.after
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: internal fun Bar.foo(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun Bar.foo(): kotlin.Unit defined in root package
 // PARAM_TYPES: Bar, Foo, kotlin.Any
 
 open class Foo
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt
index 25fe0b645b8..4609c205beb 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after
index a6baa7d23bc..d6124264ec6 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt
index d56323fdfc9..7dde79cffef 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt
@@ -1,5 +1,5 @@
 // SUGGESTED_NAMES: i, getB
-// PARAM_DESCRIPTOR: internal fun A.ext(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
 // PARAM_TYPES: B
 fun main(args: Array<String>) {
     val a: A = B()
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt.after
index 118bd7aed9c..2be0fa66c91 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt.after
@@ -1,5 +1,5 @@
 // SUGGESTED_NAMES: i, getB
-// PARAM_DESCRIPTOR: internal fun A.ext(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
 // PARAM_TYPES: B
 fun main(args: Array<String>) {
     val a: A = B()
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt
index 275494e669e..4f1aa6e4584 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after
index ac678d845a1..421e298ee65 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt
index 4c1cdd42d20..672c7c07f1d 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after
index 6ef8228970e..6bbc3be5db3 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt
index e53d99efebf..be65f3a09ee 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt
@@ -1,5 +1,5 @@
 // SUGGESTED_NAMES: i, getB
-// PARAM_DESCRIPTOR: internal fun A.ext(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
 // PARAM_TYPES: B
 fun main(args: Array<String>) {
     val a: A = B()
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt.after
index 77db121529c..34238bd277d 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt.after
@@ -1,5 +1,5 @@
 // SUGGESTED_NAMES: i, getB
-// PARAM_DESCRIPTOR: internal fun A.ext(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
 // PARAM_TYPES: B
 fun main(args: Array<String>) {
     val a: A = B()
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/missingReceiver.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/missingReceiver.kt
index 941a0f25584..1410fb90b5c 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/missingReceiver.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/missingReceiver.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.String
-// PARAM_DESCRIPTOR: internal final fun kotlin.String.foo(): kotlin.Unit defined in X
+// PARAM_DESCRIPTOR: public final fun kotlin.String.foo(): kotlin.Unit defined in X
 
 fun print(a: Any) {
 
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/missingReceiver.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/missingReceiver.kt.after
index ef79504739a..2f1f940a6ef 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/missingReceiver.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/missingReceiver.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.String
-// PARAM_DESCRIPTOR: internal final fun kotlin.String.foo(): kotlin.Unit defined in X
+// PARAM_DESCRIPTOR: public final fun kotlin.String.foo(): kotlin.Unit defined in X
 
 fun print(a: Any) {
 
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt
index ac99be7f570..7c82bacf2e8 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt
@@ -1,7 +1,7 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: B
-// PARAM_DESCRIPTOR: internal final class A defined in root package
-// PARAM_DESCRIPTOR: internal final fun B.foo(): Int defined in A
+// PARAM_DESCRIPTOR: public final class A defined in root package
+// PARAM_DESCRIPTOR: public final fun B.foo(): Int defined in A
 // SIBLING:
 class A {
     val a = 1
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after
index 9234931ccee..3d9e50b39ea 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after
@@ -1,7 +1,7 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: B
-// PARAM_DESCRIPTOR: internal final class A defined in root package
-// PARAM_DESCRIPTOR: internal final fun B.foo(): Int defined in A
+// PARAM_DESCRIPTOR: public final class A defined in root package
+// PARAM_DESCRIPTOR: public final fun B.foo(): Int defined in A
 // SIBLING:
 class A {
     val a = 1
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt
index b9f342f8854..a76341fed5e 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: internal fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
 // PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo
 // PARAM_TYPES: kotlin.String.() -> kotlin.Unit
 // PARAM_TYPES: kotlin.String
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt.after
index b78cfea006e..ffe1fbf08ae 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt.after
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: internal fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
 // PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo
 // PARAM_TYPES: kotlin.String.() -> kotlin.Unit
 // PARAM_TYPES: kotlin.String
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt
index 357ee5da5fd..d1a2e728d59 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: internal fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
 // PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo
 // PARAM_TYPES: kotlin.String.() -> kotlin.Unit
 // PARAM_TYPES: kotlin.String
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt.after
index 841f5e6fad1..72c3eb03777 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt.after
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: internal fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
 // PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo
 // PARAM_TYPES: kotlin.String.() -> kotlin.Unit
 // PARAM_TYPES: kotlin.String
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt b/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt
index 60482eec91f..23aa02e86b7 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt
@@ -1,7 +1,7 @@
 // PARAM_TYPES: X
 // PARAM_TYPES: Y
-// PARAM_DESCRIPTOR: internal final fun X.test(): kotlin.Unit defined in Y
-// PARAM_DESCRIPTOR: internal final class Y defined in root package
+// PARAM_DESCRIPTOR: public final fun X.test(): kotlin.Unit defined in Y
+// PARAM_DESCRIPTOR: public final class Y defined in root package
 class X(val x: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt.after
index e2def9171d5..5d6cdd5668a 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt.after
@@ -1,7 +1,7 @@
 // PARAM_TYPES: X
 // PARAM_TYPES: Y
-// PARAM_DESCRIPTOR: internal final fun X.test(): kotlin.Unit defined in Y
-// PARAM_DESCRIPTOR: internal final class Y defined in root package
+// PARAM_DESCRIPTOR: public final fun X.test(): kotlin.Unit defined in Y
+// PARAM_DESCRIPTOR: public final class Y defined in root package
 class X(val x: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt
index a0282a38ac1..a105b6aa123 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt
@@ -7,7 +7,7 @@
 import java.util.*
 
 // SIBLING:
-class Foo<T> {
+internal class Foo<T> {
     val map = HashMap<String, T>()
 
     fun test(l: String): T {
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after
index d4af32e7b7a..4e7270860d1 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after
@@ -7,7 +7,7 @@
 import java.util.*
 
 // SIBLING:
-class Foo<T> {
+internal class Foo<T> {
     val map = HashMap<String, T>()
 
     fun test(l: String): T {
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt
index f747d3b3dc8..ca9b3180324 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt
@@ -1,8 +1,8 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: A.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: internal final class A<T : Data> where T : DataEx defined in root package
-// PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A
+// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
+// PARAM_DESCRIPTOR: public final inner class B<U : Data> where U : DataExEx defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
 interface DataEx
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
index 97362da32c1..876ac3d482a 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
@@ -1,8 +1,8 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: A.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: internal final class A<T : Data> where T : DataEx defined in root package
-// PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A
+// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
+// PARAM_DESCRIPTOR: public final inner class B<U : Data> where U : DataExEx defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
 interface DataEx
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt
index dcfadd3eb0d..1c5473a62ff 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A
+// PARAM_DESCRIPTOR: public final inner class B<U : Data> where U : DataExEx defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
 interface DataEx
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after
index 38448313464..404a1887b59 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A
+// PARAM_DESCRIPTOR: public final inner class B<U : Data> where U : DataExEx defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
 interface DataEx
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt
index 006bc9a80d8..f93afcfda5a 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt
@@ -1,8 +1,8 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: A.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: internal final class A<T : Data> defined in root package
-// PARAM_DESCRIPTOR: internal final inner class B<U : Data> defined in A
+// PARAM_DESCRIPTOR: public final class A<T : Data> defined in root package
+// PARAM_DESCRIPTOR: public final inner class B<U : Data> defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
 
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
index baa80592fe3..d79f910d5a7 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
@@ -1,8 +1,8 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: A.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: internal final class A<T : Data> defined in root package
-// PARAM_DESCRIPTOR: internal final inner class B<U : Data> defined in A
+// PARAM_DESCRIPTOR: public final class A<T : Data> defined in root package
+// PARAM_DESCRIPTOR: public final inner class B<U : Data> defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
 
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt
index 62558b37080..e8a0afd0b73 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: internal final inner class B<U : Data> defined in A
+// PARAM_DESCRIPTOR: public final inner class B<U : Data> defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
 
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after
index 5bb6cb0050e..63ef70336ea 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: internal final inner class B<U : Data> defined in A
+// PARAM_DESCRIPTOR: public final inner class B<U : Data> defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
 
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt
index e9d6a2e4ddd..5445c2118bf 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: internal final class A<T : Data> where T : DataEx defined in root package
+// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo
 open class Data(val x: Int)
 interface DataEx
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
index e53ae158a80..5faae6015fa 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: internal final class A<T : Data> where T : DataEx defined in root package
+// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo
 open class Data(val x: Int)
 interface DataEx