From 99ba340236bee96abd15f2b9799d47b45cb5f0ae Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 17 Aug 2016 14:19:04 +0300
Subject: [PATCH] Create from Usage: Make extension functions/properties
 'private' by default  #KT-11799 Fixed

---
 ChangeLog.md                                                  | 1 +
 .../createFromUsage/callableBuilder/CallableBuilder.kt        | 1 +
 .../createFunction/binaryOperations/plusOnLibType.kt.after    | 2 +-
 .../createFunction/binaryOperations/quotedName.kt.after       | 2 +-
 .../call/approximateAnonymousObjectRuntime.kt.after           | 2 +-
 .../createFunction/call/approximateLocalClassRuntime.kt.after | 2 +-
 .../extensionByExtensionReceiver/extensionFunction.kt.after   | 2 +-
 .../extensionByExtensionReceiver/extensionLambda.kt.after     | 2 +-
 .../extensionPropertyGetter.kt.after                          | 2 +-
 .../extensionPropertySetter.kt.after                          | 2 +-
 .../createFunction/call/extensionFunOnGroovyType.after.kt     | 2 +-
 .../createFunction/call/extensionFunOnJavaType.after.kt       | 2 +-
 .../createFunction/call/extensionFunOnTrait.kt.after          | 2 +-
 .../call/extensionFunOnTypeFromAnotherPackage.after.kt        | 2 +-
 .../createFunction/call/funOnLibObject.kt.after               | 2 +-
 .../createFromUsage/createFunction/call/funOnLibType.kt.after | 2 +-
 .../createFunction/call/functionalTypeInReceiver.kt.after     | 2 +-
 .../createFunction/call/typeArguments/extension.kt.after      | 2 +-
 .../call/typeArguments/extensionPartialSubstitution.kt.after  | 2 +-
 .../call/typeArguments/extensionWithReceiverArg.kt.after      | 2 +-
 .../extensionWithTypeParameterAsReceiver.kt.after             | 2 +-
 .../extensionWithReceiverInCallableRef.kt.after               | 4 ++--
 .../nonExtensionWithReceiverInCallableRef.kt.after            | 4 ++--
 .../component/createComponentFromUsage3.kt.after              | 2 +-
 .../createFunction/get/createGetFromUsage2.kt.after           | 2 +-
 .../createFunction/invoke/invokeOnLibType.kt.after            | 2 +-
 .../createFunction/set/createSetFromUsage2.kt.after           | 2 +-
 .../createFunction/unaryOperations/minusOnLibType.kt.after    | 2 +-
 .../extensionPropertyOnTypeFromAnotherPackage.after.kt        | 2 +-
 .../createVariable/property/extensionValOnGroovyType.after.kt | 2 +-
 .../createVariable/property/extensionValOnJavaType.after.kt   | 2 +-
 .../property/extensionWithTypeParameterAsReceiver.kt.after    | 2 +-
 .../createVariable/property/valOnLibObject.kt.after           | 2 +-
 .../createVariable/property/valOnLibType.kt.after             | 2 +-
 .../createVariable/property/varOnLibType.kt.after             | 2 +-
 35 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 82ac4f75353..76d83eab8a7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -220,6 +220,7 @@ These artifacts include extensions for the types available in the latter JDKs, s
 - [`KT-12627`](https://youtrack.jetbrains.com/issue/KT-12627) Allow warnings suppression for secondary constructor
 - [`KT-13365`](https://youtrack.jetbrains.com/issue/KT-13365) Disable "Create property" (non-abstract) in interfaces. Make "Create function" (non-abstract) generate function body in interfaces
 - [`KT-8903`](https://youtrack.jetbrains.com/issue/KT-8903) Remove Unused Receiver: update function/property usages
+- [`KT-11799`](https://youtrack.jetbrains.com/issue/KT-11799) Create from Usage: Make extension functions/properties 'private' by default
 
 ##### New features
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index 41485291253..ae68007e69d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -450,6 +450,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
                                  && !(containingElement is KtClass && containingElement.isInterface())
                                  && containingElement.isAncestor(config.originalElement)
                                  && callableInfo.kind != CallableKind.SECONDARY_CONSTRUCTOR) "private "
+                        else if (isExtension) "private "
                         else ""
 
                 val declaration: KtNamedDeclaration = when (callableInfo.kind) {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
index 48724bc120c..1f2f4ed2410 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
@@ -7,6 +7,6 @@ fun test() {
     val a: A<Int> = 2 + A(1)
 }
 
-infix operator fun Int.plus(a: A<Int>): A<Int> {
+private infix operator fun Int.plus(a: A<Int>): A<Int> {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
index a47932e5272..9d8302c1b60 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
@@ -5,6 +5,6 @@ fun test() {
     val t: Int = 1 `!u00A0` 2
 }
 
-infix fun Int.`!u00A0`(i: Int): Int {
+private infix fun Int.`!u00A0`(i: Int): Int {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/approximateAnonymousObjectRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/approximateAnonymousObjectRuntime.kt.after
index 36dc73f85ed..bcfa44dd5e7 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/approximateAnonymousObjectRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/approximateAnonymousObjectRuntime.kt.after
@@ -7,6 +7,6 @@ fun main(args: Array<String>) {
     list.foo { object : A() {} }
 }
 
-fun <E> List<E>.foo(function: () -> A) {
+private fun <E> List<E>.foo(function: () -> A) {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/approximateLocalClassRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/approximateLocalClassRuntime.kt.after
index 14ec65548ac..7251a5ab54b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/approximateLocalClassRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/approximateLocalClassRuntime.kt.after
@@ -9,6 +9,6 @@ fun main(args: Array<String>) {
     list.foo { Local() }
 }
 
-fun <E> List<E>.foo(function: () -> A) {
+private fun <E> List<E>.foo(function: () -> A) {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after
index 170e2bc55e3..32225c0e2d4 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after
@@ -9,6 +9,6 @@ fun A.test() {
     bar(foo(n))
 }
 
-fun A.foo(n: Int): Boolean {
+private fun A.foo(n: Int): Boolean {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after
index 131d2380028..f2b9f9c37d3 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after
@@ -12,6 +12,6 @@ fun test() {
     }
 }
 
-fun A.foo(n: Int): Boolean {
+private fun A.foo(n: Int): Boolean {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after
index f23014ef2ab..7e65cdb046c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after
@@ -2,7 +2,7 @@
 // ERROR: Property must be initialized
 class A(val n: Int)
 
-val A.foo: Boolean<caret>
+private val A.foo: Boolean
 
 class B {
     val A.test: Boolean get() = foo
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after
index 4ffe286857e..29a8aae4f52 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after
@@ -2,7 +2,7 @@
 // ERROR: Property must be initialized
 class A(val n: Int)
 
-var A.foo: Boolean<caret>
+private var A.foo: Boolean
 
 class B {
     var A.test: Boolean
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
index 2cfdc19e8aa..d36eb259e37 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
@@ -5,6 +5,6 @@ fun test(): Int {
     return A().foo()
 }
 
-fun A.foo(): Int {
+private fun A.foo(): Int {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
index 7f84aff75c6..073ef0269e9 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
@@ -5,6 +5,6 @@ fun test(): Int? {
     return A().foo(1, "2")
 }
 
-fun A.foo(i: Int, s: String): Int? {
+private fun A.foo(i: Int, s: String): Int? {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
index 6f8793ea6ac..f1ce12d3513 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
@@ -6,6 +6,6 @@ fun test(t: T) {
     val b: Boolean = t.foo("1", 2)
 }
 
-fun T.foo(s: String, i: Int): Boolean {
+private fun T.foo(s: String, i: Int): Boolean {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
index 730be647df6..da790549598 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
@@ -10,6 +10,6 @@ class X {
     }
 }
 
-fun package2.A.foo() {
+private fun package2.A.foo() {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
index 956c54954a6..dc9e31f2250 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
@@ -5,6 +5,6 @@ fun test() {
     val a: Int = Unit.foo(2)
 }
 
-fun Unit.foo(i: Int): Int {
+private fun Unit.foo(i: Int): Int {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
index 970fc6ace9f..6fab7c80d83 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
@@ -7,6 +7,6 @@ fun test() {
     val a: A<Int> = 2.foo(A(1))
 }
 
-fun Int.foo(a: A<Int>): A<Int> {
+private fun Int.foo(a: A<Int>): A<Int> {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
index 7e9ad84de19..91af8e2822b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
@@ -4,6 +4,6 @@ fun foo(block: (Int) -> String) {
     block.bar()
 }
 
-fun <P1, R> ((P1) -> R).bar() {
+private fun <P1, R> ((P1) -> R).bar() {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
index 194c2c3158d..10e9092ab06 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
@@ -7,6 +7,6 @@ class A<T>(val items: List<T>) {
     }
 }
 
-fun <E, T, U> List<E>.foo(t: T, u: U): T {
+private fun <E, T, U> List<E>.foo(t: T, u: U): T {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
index 795a111738b..f5bef78f55e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
@@ -7,6 +7,6 @@ class A<T>(val items: List<T>) {
     }
 }
 
-fun <E, T> List<E>.foo(t: T, s: String): T {
+private fun <E, T> List<E>.foo(t: T, s: String): T {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
index 194c2c3158d..10e9092ab06 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
@@ -7,6 +7,6 @@ class A<T>(val items: List<T>) {
     }
 }
 
-fun <E, T, U> List<E>.foo(t: T, u: U): T {
+private fun <E, T, U> List<E>.foo(t: T, u: U): T {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
index d67bcdcd93e..cbcc1fbf12a 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
@@ -3,6 +3,6 @@ fun <T> foo(t: T) {
     t.bar()
 }
 
-fun <T> T.bar() {
+private fun <T> T.bar() {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
index c6d6922a070..e0ce404bfb7 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
@@ -8,6 +8,6 @@ fun test() {
     consume(1.map(Int::foo))
 }
 
-fun Int.foo(): String {
-    <selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+private fun Int.foo(): String {
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
index d7c816672a4..002d1fc00f0 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
@@ -8,6 +8,6 @@ fun test() {
     consume(1.map(Int::foo))
 }
 
-fun Int.foo(): String {
-    <selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+private fun Int.foo(): String {
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
index c5d58c479d9..34e4b402fe3 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
@@ -18,6 +18,6 @@ fun foo() {
     for ((i: Int, j: Int) in Foo<Int>()) { }
 }
 
-operator fun Any.component2(): Int {
+private operator fun Any.component2(): Int {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
index 1f9fe1cc17d..98d024f4524 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
@@ -5,6 +5,6 @@ fun x (y: Any) {
     val z: Any = y[""]
 }
 
-operator fun Any.get(s: String): Any {
+private operator fun Any.get(s: String): Any {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
index af6b4cfffde..cda1ad4f442 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
@@ -7,6 +7,6 @@ fun test(): A<String> {
     return 1(2, "2")
 }
 
-operator fun Int.invoke(i: Int, s: String): A<String> {
+private operator fun Int.invoke(i: Int, s: String): A<String> {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
index 39bb5fa1bc2..a62bb47c066 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
@@ -9,6 +9,6 @@ class Foo<T> {
     }
 }
 
-operator fun <T> Any.set(s: String, w: ArrayList<T>, value: ArrayList<T>) {
+private operator fun <T> Any.set(s: String, w: ArrayList<T>, value: ArrayList<T>) {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
index b0f53605b06..5e0a83e177e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
@@ -5,6 +5,6 @@ fun test() {
     val a = -false
 }
 
-operator fun Boolean.unaryMinus(): Any {
+private operator fun Boolean.unaryMinus(): Any {
     TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt
index 832dd62d643..81c4f7c8178 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt
@@ -3,7 +3,7 @@
 
 import package1.A
 
-val package2.A.foo: Any
+private val package2.A.foo: Any<caret>
 
 class X {
     init {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt
index 577e12fc1f4..e85515fbe7d 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt
@@ -1,7 +1,7 @@
 // "Create extension property 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
-val A.foo: String?
+private val A.foo: String?<caret>
 
 fun test(): String? {
     return A().foo
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt
index 577e12fc1f4..e85515fbe7d 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt
@@ -1,7 +1,7 @@
 // "Create extension property 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
-val A.foo: String?
+private val A.foo: String?<caret>
 
 fun test(): String? {
     return A().foo
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after
index 2d7b8f94a55..3ebe6069c25 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after
@@ -2,7 +2,7 @@
 // ERROR: Property must be initialized
 fun consume(n: Int) {}
 
-val <T> T.bar: Int
+private val <T> T.bar: Int
 
 fun <T> foo(t: T) {
     consume(t.bar)
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after
index 39885ea3ecf..4455d8b42c5 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after
@@ -2,7 +2,7 @@
 // ERROR: Property must be initialized
 // WITH_RUNTIME
 
-val Unit.foo: Int
+private val Unit.foo: Int
 
 fun test() {
     val a: Int = Unit.foo
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after
index 1debb7aa8c5..6fe0ccaa760 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after
@@ -4,7 +4,7 @@
 
 class A<T>(val n: T)
 
-val Int.foo: A<Int>
+private val Int.foo: A<Int>
 
 fun test() {
     val a: A<Int> = 2.foo
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after
index b0dde2d0d41..1337a64050c 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after
@@ -4,7 +4,7 @@
 
 class A<T>(val n: T)
 
-var Int.foo: A<String>
+private var Int.foo: A<String>
 
 fun test() {
     2.foo = A("2")