From cb3328c052b9d6c0127bd1a9617d9e5030216c66 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Mon, 28 Jul 2014 16:24:05 +0400
Subject: [PATCH] Extract Function: Choose default visibility at analysis phase

---
 .../extractFunction/extractableAnalysisUtil.kt           | 9 ++++++++-
 .../extractFunction/ui/KotlinExtractFunctionDialog.java  | 7 ++-----
 .../extractFunction/basic/fragmentWithComment.kt.after   | 2 +-
 .../basic/fragmentWithMultilineComment.kt.after          | 2 +-
 .../extractFunction/basic/refInReturn.kt.after           | 2 +-
 .../conditionalJumps/conditionalBreakWithIf.kt.after     | 2 +-
 .../conditionalBreakWithIfAndExtraVars.kt.after          | 2 +-
 .../conditionalJumps/conditionalBreakWithIfElse.kt.after | 2 +-
 .../conditionalJumps/conditionalBreakWithWhen.kt.after   | 2 +-
 .../conditionalJumps/conditionalReturnWithIf.kt.after    | 2 +-
 .../conditionalReturnWithIfElse.kt.after                 | 2 +-
 .../conditionalJumps/conditionalReturnWithWhen.kt.after  | 2 +-
 .../conditionalJumps/unconditionalBreakWithIf.kt.after   | 2 +-
 .../unconditionalBreakWithIfElse.kt.after                | 2 +-
 .../conditionalJumps/unconditionalBreakWithWhen.kt.after | 2 +-
 .../controlFlow/default/defaultCF.kt.after               | 2 +-
 .../controlFlow/default/defaultCFWithExtraVars.kt.after  | 2 +-
 .../controlFlow/default/defaultCFWithJumps.kt.after      | 2 +-
 .../default/ignoredReturnValueWithIf.kt.after            | 2 +-
 .../default/ignoredReturnValueWithIfNoBlocks.kt.after    | 2 +-
 .../default/ignoredReturnValueWithWhen.kt.after          | 2 +-
 .../default/ignoredReturnValueWithWhenNoBlocks.kt.after  | 2 +-
 .../definiteReturns/definiteReturnWithIf.kt.after        | 2 +-
 .../definiteReturns/definiteReturnWithWhen.kt.after      | 2 +-
 .../definiteReturns/singleDefiniteReturn.kt.after        | 2 +-
 .../evaluateExpression/evalExprInIfCondition.kt.after    | 2 +-
 .../evaluateExpression/evalExprInIfElse.kt.after         | 2 +-
 .../evaluateExpression/evalExprInIfThen.kt.after         | 2 +-
 .../evaluateExpression/evalExprInWhenBranch.kt.after     | 2 +-
 .../evaluateExpression/evalExprInWhenCondition.kt.after  | 2 +-
 .../evaluateExpression/evalExprInWhenSubject.kt.after    | 2 +-
 .../evalExpressionBodyFunction.kt.after                  | 2 +-
 .../controlFlow/evaluateExpression/evalIfExpr.kt.after   | 2 +-
 .../controlFlow/evaluateExpression/evalWhenExpr.kt.after | 2 +-
 .../evaluateExpression/simpleEvalExpr.kt.after           | 2 +-
 .../trailingLambdaEmptyArgList.kt.after                  | 2 +-
 .../evaluateExpression/trailingLambdaNoArgList.kt.after  | 2 +-
 .../trailingLambdaNonEmptyArgList.kt.after               | 2 +-
 .../initializer/propertyWithInitializer.kt.after         | 2 +-
 .../propertyWithInitializerAndExtraVars.kt.after         | 2 +-
 .../propertyWithInitializerAndUnusedVars.kt.after        | 2 +-
 .../initializer/propertyWithSeparateInitializer.kt.after | 2 +-
 .../initializer/valueUsedInAnonymousObject.kt.after      | 2 +-
 .../controlFlow/initializer/valueUsedInLambda.kt.after   | 2 +-
 .../initializer/valueUsedInLocalFunction.kt.after        | 2 +-
 .../controlFlow/outputValues/singleOutputValue.kt.after  | 2 +-
 .../outputValues/singleOutputValueWithIf.kt.after        | 2 +-
 .../outputValues/singleOutputValueWithIfElse.kt.after    | 2 +-
 .../outputValues/singleOutputValueWithWhen.kt.after      | 2 +-
 .../outputValues/singleOutputValueWithWhenElse.kt.after  | 2 +-
 .../outputValues/valuesUsedInLambdaOnly.kt.after         | 2 +-
 .../outputValues/valuesUsedInNestedBlock.kt.after        | 2 +-
 .../controlFlow/throws/breakWithThrow.kt.after           | 2 +-
 .../controlFlow/throws/continueWithThrow.kt.after        | 2 +-
 .../controlFlow/throws/evalExpressionWithThrow.kt.after  | 2 +-
 .../controlFlow/throws/nonValuedReturnWithThrow.kt.after | 2 +-
 .../controlFlow/throws/outputValueWithThrow.kt.after     | 2 +-
 .../controlFlow/throws/returnWithThrow.kt.after          | 2 +-
 .../defaultContainer/anonymousObject.kt.after            | 2 +-
 .../defaultContainer/classFunction.kt.after              | 2 +-
 .../extractFunction/defaultContainer/lambda.kt.after     | 2 +-
 .../extractFunction/defaultContainer/localClass.kt.after | 2 +-
 .../defaultContainer/nestedLambda.kt.after               | 2 +-
 .../defaultContainer/topLevelFunction.kt.after           | 2 +-
 .../delegation/delegationByExpression.kt.after           | 2 +-
 .../delegation/delegationByExpressionFull.kt.after       | 2 +-
 .../delegation/delegationBySuperCall.kt.after            | 2 +-
 .../initializers/accessors/memberProperty.kt.after       | 2 +-
 .../accessors/memberPropertyWithLambda.kt.after          | 2 +-
 .../initializers/accessors/topLevelProperty.kt.after     | 2 +-
 .../accessors/topLevelPropertyWithLambda.kt.after        | 2 +-
 .../initializers/classes/classInitializer.kt.after       | 2 +-
 .../classes/classInitializerWithLambda.kt.after          | 2 +-
 .../initializers/classes/classParameters.kt.after        | 2 +-
 .../classes/classParametersWithLambda.kt.after           | 2 +-
 .../initializers/functions/memberFunction.kt.after       | 2 +-
 .../functions/memberFunctionParameters.kt.after          | 2 +-
 .../memberFunctionParametersWithLambda.kt.after          | 2 +-
 .../functions/memberFunctionWithLambda.kt.after          | 2 +-
 .../initializers/functions/topLevelFunction.kt.after     | 2 +-
 .../functions/topLevelFunctionParameters.kt.after        | 2 +-
 .../topLevelFunctionParametersWithLambda.kt.after        | 2 +-
 .../functions/topLevelFunctionWithLambda.kt.after        | 2 +-
 .../initializers/properties/memberProperty.kt.after      | 2 +-
 .../properties/memberPropertyWithLambda.kt.after         | 2 +-
 .../initializers/properties/topLevelProperty.kt.after    | 2 +-
 .../properties/topLevelPropertyWithLambda.kt.after       | 2 +-
 .../parameters/candidateTypes/nonNullableTypes.kt.after  | 2 +-
 .../parameters/candidateTypes/nullableTypes.kt.after     | 2 +-
 .../parameters/candidateTypes/typeHierarchy1.kt.after    | 2 +-
 .../parameters/candidateTypes/typeHierarchy2.kt.after    | 2 +-
 .../parameters/candidateTypes/typeHierarchy3.kt.after    | 2 +-
 .../parameters/candidateTypes/typeHierarchy4.kt.after    | 2 +-
 .../extractThis/explicitLabeledThisInMember.kt.after     | 2 +-
 .../extractThis/explicitThisInExtension.kt.after         | 2 +-
 .../parameters/extractThis/explicitThisInMember.kt.after | 2 +-
 .../implicitAndExplicitLabeledThisInMember.kt.after      | 2 +-
 .../implicitAndExplicitThisInExtension.kt.after          | 2 +-
 .../extractThis/implicitThisInExtension.kt.after         | 2 +-
 .../parameters/extractThis/implicitThisInMember.kt.after | 2 +-
 .../extractFunction/parameters/it/innerIt.kt.after       | 2 +-
 .../extractFunction/parameters/it/lambdaWithIt.kt.after  | 2 +-
 .../extractFunction/parameters/it/outerIt.kt.after       | 2 +-
 .../extractFunction/parameters/it/simpleIt.kt.after      | 2 +-
 .../extractFunction/parameters/misc/classObject.kt.after | 2 +-
 .../parameters/misc/innerClassObject.kt.after            | 2 +-
 .../extractFunction/parameters/misc/kt5001.kt.after      | 2 +-
 .../parameters/misc/multiDeclaration.kt.after            | 2 +-
 .../parameters/misc/multipleOccurrences.kt.after         | 2 +-
 .../parameters/misc/qualifiedAnnotation.kt.after         | 2 +-
 .../parameters/misc/qualifiedClassObject.kt.after        | 2 +-
 .../parameters/misc/qualifiedEnum.kt.after               | 2 +-
 .../parameters/misc/qualifiedObject.kt.after             | 2 +-
 .../parameters/misc/qualifiedPackage.kt.after            | 2 +-
 .../parameters/misc/qualifiedTypeArg.kt.after            | 2 +-
 .../parameters/misc/qualifiedTypeInValueArg.kt.after     | 2 +-
 .../parameters/misc/qualifiedTypeRef.kt.after            | 2 +-
 .../parameters/misc/reducedParameterList.kt.after        | 2 +-
 .../extractFunction/parameters/misc/typeRef.kt.after     | 2 +-
 .../parameters/misc/usagesInCallArgs.kt.after            | 2 +-
 .../parameters/misc/variableAsFunction.kt.after          | 2 +-
 .../typeParameters/simpleTypeParameter.kt.after          | 2 +-
 .../simpleTypeParameterWithConstraint.kt.after           | 2 +-
 .../typeParameters/typeParamInArgument.kt.after          | 2 +-
 .../typeParametersAndConstraintsCombined1.kt.after       | 2 +-
 .../typeParametersAndConstraintsCombined2.kt.after       | 2 +-
 .../typeParametersAndConstraintsCombined3.kt.after       | 2 +-
 .../typeParameters/typeParametersCombined1.kt.after      | 2 +-
 .../typeParameters/typeParametersCombined2.kt.after      | 2 +-
 .../typeParameters/typeParametersCombined3.kt.after      | 2 +-
 .../typeParametersCombinedAndThis.kt.after               | 2 +-
 131 files changed, 139 insertions(+), 135 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt
index 9bbb55e9e97..984adf01fda 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt
@@ -581,6 +581,13 @@ private fun ExtractionData.getLocalInstructions(pseudocode: Pseudocode): List<In
     return instructions
 }
 
+fun ExtractionData.isVisibilityApplicable(): Boolean {
+    return when (targetSibling.getParent()) {
+        is JetClassBody, is JetFile -> true
+        else -> false
+    }
+}
+
 fun ExtractionData.performAnalysis(): AnalysisResult {
     if (originalElements.empty) {
         return AnalysisResult(null, Status.CRITICAL_ERROR, listOf(ErrorMessage.NO_EXPRESSION))
@@ -664,7 +671,7 @@ fun ExtractionData.performAnalysis(): AnalysisResult {
             ExtractableCodeDescriptor(
                     this,
                     functionName,
-                    "",
+                    if (isVisibilityApplicable()) "private" else "",
                     adjustedParameters.sortBy { it.name },
                     receiverParameter,
                     paramsInfo.typeParameters.sortBy { it.originalDeclaration.getName()!! },
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinExtractFunctionDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinExtractFunctionDialog.java
index e89dec7bc48..b13952c7108 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinExtractFunctionDialog.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinExtractFunctionDialog.java
@@ -29,8 +29,6 @@ import kotlin.Function0;
 import kotlin.Function1;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetClassBody;
-import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.refactoring.JetNameSuggester;
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle;
 import org.jetbrains.jet.plugin.refactoring.RefactoringPackage;
@@ -81,8 +79,7 @@ public class KotlinExtractFunctionDialog extends DialogWrapper {
     }
 
     private boolean isVisibilitySectionAvailable() {
-        PsiElement target = originalDescriptor.getDescriptor().getExtractionData().getTargetSibling().getParent();
-        return target instanceof JetClassBody || target instanceof JetFile;
+        return ExtractFunctionPackage.isVisibilityApplicable(originalDescriptor.getDescriptor().getExtractionData());
     }
 
     private String getFunctionName() {
@@ -132,7 +129,7 @@ public class KotlinExtractFunctionDialog extends DialogWrapper {
         boolean enableVisibility = isVisibilitySectionAvailable();
         visibilityBox.setEnabled(enableVisibility);
         if (enableVisibility) {
-            visibilityBox.setSelectedItem("private");
+            visibilityBox.setSelectedItem(originalDescriptor.getDescriptor().getVisibility());
         }
         visibilityBox.addItemListener(
                 new ItemListener() {
diff --git a/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt.after b/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt.after
index 76f0c127848..710699d08bb 100644
--- a/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt.after
@@ -6,7 +6,7 @@ fun foo(a: Int): Int {
     return -a
 }
 
-fun b(a: Int): Boolean {
+private fun b(a: Int): Boolean {
     // test
     println(a)
     if (a > 0) return true
diff --git a/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt.after b/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt.after
index cfd9a61db18..3fd8b275d61 100644
--- a/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt.after
@@ -6,7 +6,7 @@ fun foo(a: Int): Int {
     return -a
 }
 
-fun b(a: Int): Boolean {
+private fun b(a: Int): Boolean {
     /*
         test
         */
diff --git a/idea/testData/refactoring/extractFunction/basic/refInReturn.kt.after b/idea/testData/refactoring/extractFunction/basic/refInReturn.kt.after
index e07b4bfdb7f..4fbc30c093f 100644
--- a/idea/testData/refactoring/extractFunction/basic/refInReturn.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/refInReturn.kt.after
@@ -6,7 +6,7 @@ fun foo(a: Int): Int {
     return -a
 }
 
-fun b(a: Int): Boolean {
+private fun b(a: Int): Boolean {
     println(a)
     if (a > 0) return true
     return false
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after
index 48637879611..342219bdf32 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after
@@ -11,7 +11,7 @@ fun foo(a: Int): Int {
     return 1
 }
 
-fun b(a: Int, b: Int): Boolean {
+private fun b(a: Int, b: Int): Boolean {
     if (a + b > 0) return true
     println(a - b)
     if (a - b > 0) return true
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt.after
index 40aa83df2cc..35f1a7a4133 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt.after
@@ -14,7 +14,7 @@ fun foo(a: Int): Int {
     return 1
 }
 
-fun b(a: Int, b: Int): Boolean {
+private fun b(a: Int, b: Int): Boolean {
     if (a + b > 0) return true
     val c: Int
     println(a - b)
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after
index 1ff929c2371..79a783e9d2c 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after
@@ -12,7 +12,7 @@ fun foo(a: Int): Int {
     return 1
 }
 
-fun b(a: Int, b: Int): Boolean {
+private fun b(a: Int, b: Int): Boolean {
     if (a + b > 0) return true
     else {
         println(a - b)
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after
index 122f62a5f40..1802510f3e2 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after
@@ -11,7 +11,7 @@ fun foo(a: Int): Int {
     return 1
 }
 
-fun b(a: Int, b: Int): Boolean {
+private fun b(a: Int, b: Int): Boolean {
     when {
         a + b > 0 -> return true
         a - b > 0 -> return true
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after
index 647d6e30ee6..3820c5a7d2d 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after
@@ -9,7 +9,7 @@ fun foo(a: Int): Int {
     return 1
 }
 
-fun b(a: Int, b: Int): Boolean {
+private fun b(a: Int, b: Int): Boolean {
     if (a + b > 0) return true
     println(a - b)
     return false
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after
index 2536df0ea86..e6397f40f33 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after
@@ -9,7 +9,7 @@ fun foo(a: Int): Int {
     return 1
 }
 
-fun b(a: Int, b: Int): Boolean {
+private fun b(a: Int, b: Int): Boolean {
     if (a + b > 0) return true
     else if (a - b < 0) println(a - b)
     else println(0)
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after
index ee6428f6542..903208941cd 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after
@@ -10,7 +10,7 @@ fun foo(a: Int): Int {
     return 1
 }
 
-fun b(a: Int, b: Int): Boolean {
+private fun b(a: Int, b: Int): Boolean {
     when (a + b) {
         0 -> return true
         1 -> println(1)
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after
index ce7431197f9..889ad19b5a8 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after
@@ -12,7 +12,7 @@ fun foo(a: Int): Int {
     return 1
 }
 
-fun unit(a: Int, b: Int) {
+private fun unit(a: Int, b: Int) {
     if (a + b > 0) return
     println(a - b)
     return
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after
index 6f72aa7fa72..c1e276317f6 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after
@@ -12,7 +12,7 @@ fun foo(a: Int): Int {
     return 1
 }
 
-fun unit(a: Int, b: Int) {
+private fun unit(a: Int, b: Int) {
     if (a + b > 0) return
     else {
         println(a - b)
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after
index 766a3174a34..0c6ea3af527 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after
@@ -12,7 +12,7 @@ fun foo(a: Int): Int {
     return 1
 }
 
-fun unit(a: Int, b: Int) {
+private fun unit(a: Int, b: Int) {
     when {
         a + b > 0 -> return
         a - b > 0 -> return
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after
index 2ed8c35aaa1..807d1075aa9 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after
@@ -9,7 +9,7 @@ fun foo(a: Int) {
     unit(a, b)
 }
 
-fun unit(a: Int, b: Int) {
+private fun unit(a: Int, b: Int) {
     if (a > 0) {
         println(a)
     }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt.after
index 83018b34df5..9b9ac1011cd 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt.after
@@ -13,7 +13,7 @@ fun foo(a: Int) {
     println(c)
 }
 
-fun unit(a: Int, b: Int) {
+private fun unit(a: Int, b: Int) {
     if (a > 0) {
         println(a)
     }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt.after
index 5f5b6d574f7..cae5d7bf1ef 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt.after
@@ -7,7 +7,7 @@ fun foo(a: Int) {
     unit(a)
 }
 
-fun unit(a: Int) {
+private fun unit(a: Int) {
     var t = a
     while (t > 0) {
         if (t == 2) continue
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after
index 9f99d56a74f..a0b534e7e34 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after
@@ -15,7 +15,7 @@ fun foo(a: Int) {
 
 }
 
-fun unit(a: Int, b: Int) {
+private fun unit(a: Int, b: Int) {
     if (a > 0) {
         bar(a)
     } else {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after
index e41b8f6430d..b3dc70346ff 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after
@@ -14,6 +14,6 @@ fun foo(a: Int) {
     unit(a, b)
 }
 
-fun unit(a: Int, b: Int) {
+private fun unit(a: Int, b: Int) {
     if (a > 0) bar(a) else b
 }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after
index cd3496f872a..c0817f59244 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after
@@ -15,7 +15,7 @@ fun foo(a: Int) {
 
 }
 
-fun unit(a: Int, b: Int) {
+private fun unit(a: Int, b: Int) {
     when {
         a > 0 -> {
             bar(a)
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after
index 488f20e708a..443ae9f4de7 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after
@@ -15,7 +15,7 @@ fun foo(a: Int) {
     
 }
 
-fun unit(a: Int, b: Int) {
+private fun unit(a: Int, b: Int) {
     when {
         a > 0 -> bar(a)
         else -> b
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after
index 85e4d82bb3d..22c84263bc1 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after
@@ -8,7 +8,7 @@ fun foo(a: Int): Int {
     return i(a, b)
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     if (a + b > 0) return 1
     else if (a - b < 0) return 2
     else return b
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after
index f60fd2eb8ee..ee8ffdc3850 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after
@@ -8,7 +8,7 @@ fun foo(a: Int): Int {
     return i(a, b)
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     when (a + b) {
         0 -> return b
         1 -> return -b
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after
index b450e6a6a91..3a6d42641e6 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after
@@ -8,6 +8,6 @@ fun foo(a: Int): Int {
     return i(a, b)
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return a + b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after
index 7fb18200d06..bc97f97bbd6 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after
@@ -8,6 +8,6 @@ fun foo(a: Int): Int {
     return if (b(a, b)) 1 else if (a - b < 0) 2 else b
 }
 
-fun b(a: Int, b: Int): Boolean {
+private fun b(a: Int, b: Int): Boolean {
     return a + b > 0
 }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after
index de6d7082d55..dbeb267dc47 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after
@@ -8,6 +8,6 @@ fun foo(a: Int): Int {
     return if (a + b > 0) 1 else i(a, b)
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return if (a - b < 0) 2 else b
 }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt.after
index 5ca2c148d0b..18a4e9d87bc 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt.after
@@ -4,6 +4,6 @@ fun foo(a: Int): Int {
     return if (a + b > 0) i() else if (a - b < 0) 2 else b
 }
 
-fun i(): Int {
+private fun i(): Int {
     return 1
 }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after
index 2af79bde459..50a0a9270c9 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after
@@ -10,6 +10,6 @@ fun foo(a: Int): Int {
     }
 }
 
-fun i(b: Int): Int {
+private fun i(b: Int): Int {
     return b
 }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt.after
index 7ca3c9729df..96aa63fb28f 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt.after
@@ -8,6 +8,6 @@ fun foo(a: Int): Int {
     }
 }
 
-fun i(): Int {
+private fun i(): Int {
     return 0
 }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after
index 0a25b06dcd3..d55b7f73176 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after
@@ -12,6 +12,6 @@ fun foo(a: Int): Int {
     }
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return a + b
 }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after
index be1d2e97946..9d2130f69e2 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after
@@ -5,6 +5,6 @@
 // SIBLING:
 fun foo(a: Int, b: Int): Int = i(a, b)
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return a + b
 }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after
index f54c207bce0..5807a2c431d 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after
@@ -8,6 +8,6 @@ fun foo(a: Int): Int {
     return i(a, b) 
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return if (a + b > 0) 1 else if (a - b < 0) 2 else b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after
index 9c3b692438d..1c639b3c76c 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after
@@ -8,7 +8,7 @@ fun foo(a: Int): Int {
     return i(a, b)
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return when (a + b) {
         0 -> b
         1 -> -b
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after
index b450e6a6a91..3a6d42641e6 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after
@@ -8,6 +8,6 @@ fun foo(a: Int): Int {
     return i(a, b)
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return a + b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt.after
index c21ead68b75..b61f7c3f7ea 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt.after
@@ -5,6 +5,6 @@ fun foo(t: Array<Int>) {
     t.check(function())
 }
 
-fun function(): (Int) -> Boolean {
+private fun function(): (Int) -> Boolean {
     return { it + 1 > 1 }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt.after
index c21ead68b75..b61f7c3f7ea 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt.after
@@ -5,6 +5,6 @@ fun foo(t: Array<Int>) {
     t.check(function())
 }
 
-fun function(): (Int) -> Boolean {
+private fun function(): (Int) -> Boolean {
     return { it + 1 > 1 }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt.after
index 567ab21da22..d8fbe125f6e 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt.after
@@ -5,6 +5,6 @@ fun foo(t: Array<Int>) {
     t.check(1, 2, function())
 }
 
-fun function(): (Int) -> Boolean {
+private fun function(): (Int) -> Boolean {
     return { it + 1 > 1 }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializer.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializer.kt.after
index 29251260dba..465463240b9 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializer.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializer.kt.after
@@ -4,7 +4,7 @@ fun foo() {
     println(a)
 }
 
-fun i(): Int {
+private fun i(): Int {
     val a = 10
     return a
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndExtraVars.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndExtraVars.kt.after
index 206b9589fb5..167a5527a7e 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndExtraVars.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndExtraVars.kt.after
@@ -9,7 +9,7 @@ fun foo() {
     println(a + b + c)
 }
 
-fun i(): Int {
+private fun i(): Int {
     val a: Int
     val b = 10
     val c: Int
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndUnusedVars.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndUnusedVars.kt.after
index ad5c5686642..fa065533602 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndUnusedVars.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndUnusedVars.kt.after
@@ -7,7 +7,7 @@ fun foo() {
     println(a + b)
 }
 
-fun i(): Int {
+private fun i(): Int {
     val a: Int
     val b = 10
     val c: Int = 1
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithSeparateInitializer.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithSeparateInitializer.kt.after
index b0f7df39a91..325eed96aa8 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithSeparateInitializer.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithSeparateInitializer.kt.after
@@ -4,7 +4,7 @@ fun foo() {
     println(a)
 }
 
-fun i(): Int {
+private fun i(): Int {
     val a: Int
     a = 10
     return a
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInAnonymousObject.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInAnonymousObject.kt.after
index b872eef2275..5e9c1415762 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInAnonymousObject.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInAnonymousObject.kt.after
@@ -6,7 +6,7 @@ fun main(args: Array<String>) {
     }
 }
 
-fun i(): Int {
+private fun i(): Int {
     val a = 1
     return a
 }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLambda.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLambda.kt.after
index c2601d65dac..5c3a03e5688 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLambda.kt.after
@@ -6,7 +6,7 @@ fun main(args: Array<String>) {
     }
 }
 
-fun i(): Int {
+private fun i(): Int {
     val a = 1
     return a
 }
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLocalFunction.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLocalFunction.kt.after
index 7bbff1dcba1..c1981a46094 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLocalFunction.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLocalFunction.kt.after
@@ -4,7 +4,7 @@ fun main(args: Array<String>) {
     fun foo() = a
 }
 
-fun i(): Int {
+private fun i(): Int {
     val a = 1
     return a
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after
index d5046bc5075..f1d5bff6b2a 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after
@@ -11,7 +11,7 @@ fun foo(a: Int): Int {
     return b
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     var b1 = b
     b1 += a
     println(b1)
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after
index 54c68a2cbeb..20dd13c56d4 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after
@@ -11,7 +11,7 @@ fun foo(a: Int): Int {
     return b
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     var b1 = b
     if (a > 0) {
         b1 = b1 + 1
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after
index 492f2857aa0..9f26159cdde 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after
@@ -11,7 +11,7 @@ fun foo(a: Int): Int {
     return b
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     var b1 = b
     if (a > 0) {
         b1 = b1 + 1
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after
index 5c43efb80f4..f09e50c8a5d 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after
@@ -11,7 +11,7 @@ fun foo(a: Int): Int {
     return b
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     var b1 = b
     when {
         a > 0 -> {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after
index 948921f4313..7e735e7067e 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after
@@ -11,7 +11,7 @@ fun foo(a: Int): Int {
     return b
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     var b1 = b
     when {
         a > 0 -> {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInLambdaOnly.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInLambdaOnly.kt.after
index 6794746f692..9d2c3bacb17 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInLambdaOnly.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInLambdaOnly.kt.after
@@ -5,7 +5,7 @@ fun foo() {
     unit()
 }
 
-fun unit() {
+private fun unit() {
     bar { t ->
         val k = 1
         t.n + k + 1
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInNestedBlock.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInNestedBlock.kt.after
index ee204246804..504372865a5 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInNestedBlock.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInNestedBlock.kt.after
@@ -5,7 +5,7 @@ fun foo() {
     unit()
 }
 
-fun unit() {
+private fun unit() {
     if (true) {
         val k = 1
         T().n + k + 1
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after
index 814788a847c..652bcb0ab59 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after
@@ -10,7 +10,7 @@ fun foo(a: Int): Int {
     }
 }
 
-fun b(a: Int, b: Int): Boolean {
+private fun b(a: Int, b: Int): Boolean {
     if (a > 0) throw Exception("")
     if (a + b > 0) return true
     println(a - b)
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after
index f62434ac429..33044b59d60 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after
@@ -10,7 +10,7 @@ fun foo(a: Int): Int {
     }
 }
 
-fun b(a: Int, b: Int): Boolean {
+private fun b(a: Int, b: Int): Boolean {
     if (a > 0) throw Exception("")
     if (a + b > 0) return true
     println(a - b)
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after
index a61342d658d..28d8f02f08f 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after
@@ -10,6 +10,6 @@ fun foo(a: Int): Int {
     return t
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return if (a > 0) throw Exception("") else a + b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after
index 719caeee060..ab7a315973e 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after
@@ -9,7 +9,7 @@ fun foo(a: Int) {
     if (b(a, b)) return
 }
 
-fun b(a: Int, b: Int): Boolean {
+private fun b(a: Int, b: Int): Boolean {
     if (a > 0) throw Exception("")
     if (b + a > 0) return true
     println(a - b)
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt.after
index d8b8bfbaf84..69e90a9a63c 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt.after
@@ -9,7 +9,7 @@ fun foo(a: Int): Int {
     return b
 }
 
-fun i(b: Int): Int {
+private fun i(b: Int): Int {
     var b1 = b
     if (n == 10) throw Exception("")
     b1++
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after
index 08d2ec3c365..53fb7d5cf09 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after
@@ -9,7 +9,7 @@ fun foo(a: Int): Int {
     return i(a, b)
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     if (a > 0) throw Exception("") else return a + b
     return a - b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt.after
index 5737ef3ca54..6d8c34e23b3 100644
--- a/idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt.after
+++ b/idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt.after
@@ -5,7 +5,7 @@ class A {
                 return i()
             }
 
-            fun i(): Int {
+            private fun i(): Int {
                 return a + b - 1
             }
         }
diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after
index c991b08a509..9fb4d8d44ab 100644
--- a/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after
+++ b/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after
@@ -8,7 +8,7 @@ class A {
             return i(a, b)
         }
 
-        fun i(a: Int, b: Int): Int {
+        private fun i(a: Int, b: Int): Int {
             return a + b - 1
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after
index 2368a642692..da233e99f55 100644
--- a/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after
@@ -9,7 +9,7 @@ class A {
         }.invoke()
     }
 
-    fun i(a: Int, b: Int): Int {
+    private fun i(a: Int, b: Int): Int {
         return a + b - 1
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt.after
index 8ffad0a473d..6e83fa52afd 100644
--- a/idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt.after
+++ b/idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt.after
@@ -5,7 +5,7 @@ class A {
                 return i()
             }
 
-            fun i(): Int {
+            private fun i(): Int {
                 return a + b - 1
             }
         }
diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after
index e4d9d760e16..ef8b88d4cdd 100644
--- a/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after
@@ -9,7 +9,7 @@ class A {
         }.invoke()
     }
 
-    fun i(a: Int, b: Int): Int {
+    private fun i(a: Int, b: Int): Int {
         return a + b - 1
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after
index 0777e9e3f9a..08e149c94ae 100644
--- a/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after
+++ b/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after
@@ -6,6 +6,6 @@ fun foo(a: Int, b: Int): Int {
     return i(a, b)
 }
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return a + b - 1
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after b/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after
index 587042480fd..b67dbad0cb3 100644
--- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after
+++ b/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after
@@ -8,6 +8,6 @@ class A(a: Int, b: Int): T
 
 class B(a: Int, b: Int): T by A(i(a, b), a - b)
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return a + b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after b/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after
index aa8a2eee223..82130be2a9a 100644
--- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after
+++ b/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after
@@ -6,6 +6,6 @@ class A(a: Int, b: Int): T
 
 class B(t: T): T by t(t)
 
-fun t(t: T): T {
+private fun t(t: T): T {
     return t
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after b/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after
index b842b5df52d..38482ecbc93 100644
--- a/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after
+++ b/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after
@@ -6,6 +6,6 @@ open class A(a: Int, b: Int)
 
 class B(a: Int, b: Int): A(i(a, b), a - b)
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return a + b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt.after b/idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt.after
index 89fa1375bee..275f049d19c 100644
--- a/idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt.after
@@ -1,7 +1,7 @@
 class A(val a: Int, val b: Int) {
     val foo: Int get() = i() - 1
 
-    fun i(): Int {
+    private fun i(): Int {
         return a + b
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt.after
index b7f28f3bc6b..ce8c8a4bcfa 100644
--- a/idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt.after
@@ -1,7 +1,7 @@
 class A(val a: Int, val b: Int) {
     val foo: Int get() = { i() - 1 }.invoke()
 
-    fun i(): Int {
+    private fun i(): Int {
         return a + b
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt.after b/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt.after
index 1d6fb4b498c..6377c8a8614 100644
--- a/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt.after
@@ -2,6 +2,6 @@ val a = 1
 val b = 1
 val foo: Int get() = i() - 1
 
-fun i(): Int {
+private fun i(): Int {
     return a + b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt.after
index cc9184becd5..d3524835e29 100644
--- a/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt.after
@@ -2,6 +2,6 @@ val a = 1
 val b = 1
 val foo: Int get() = { i() - 1 }.invoke()
 
-fun i(): Int {
+private fun i(): Int {
     return a + b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after
index 66871e2b1de..88118357111 100644
--- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after
@@ -5,7 +5,7 @@ class A(val a: Int, b: Int) {
         println(i(b) - 1)
     }
 
-    fun i(b: Int): Int {
+    private fun i(b: Int): Int {
         return a + b
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after
index 63051ce24a1..5892c73e83f 100644
--- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after
@@ -5,7 +5,7 @@ class A(val a: Int, b: Int) {
         println({ i(b) - 1 }.invoke())
     }
 
-    fun i(b: Int): Int {
+    private fun i(b: Int): Int {
         return a + b
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after b/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after
index 57fca38cac6..98330fba5a8 100644
--- a/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after
@@ -3,6 +3,6 @@
 val n = 1
 class A(val a: Int, val b: Int = i(a))
 
-fun i(a: Int): Int {
+private fun i(a: Int): Int {
     return a + n
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after
index ddeb1e23f56..e1704cd99ae 100644
--- a/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after
@@ -3,6 +3,6 @@
 val n = 1
 class A(val a: Int, val b: Int = { i(a) }.invoke())
 
-fun i(a: Int): Int {
+private fun i(a: Int): Int {
     return a + n
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt.after
index bddd825ae4a..f8871700531 100644
--- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt.after
@@ -5,7 +5,7 @@
 class A(val n: Int) {
     fun foo(a: Int, b: Int) = i(a, b) - 1
 
-    fun i(a: Int, b: Int): Int {
+    private fun i(a: Int, b: Int): Int {
         return a + b - n
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after
index b7a0195683e..5250948c2e2 100644
--- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after
@@ -3,7 +3,7 @@
 class A(val n: Int) {
     fun foo(a: Int, b: Int = i(a)) = a + b - n - 1
 
-    fun i(a: Int): Int {
+    private fun i(a: Int): Int {
         return a + n
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after
index b2b5ab817c6..8371f67d128 100644
--- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after
@@ -3,7 +3,7 @@
 class A(val n: Int) {
     fun foo(a: Int, b: Int = { i(a) }.invoke()) = a + b - n - 1
 
-    fun i(a: Int): Int {
+    private fun i(a: Int): Int {
         return a + n
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt.after
index 13fa5a00552..991923ea0f5 100644
--- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt.after
@@ -5,7 +5,7 @@
 class A(val n: Int) {
     fun foo(a: Int, b: Int) = { i(a, b) - 1 }.invoke()
 
-    fun i(a: Int, b: Int): Int {
+    private fun i(a: Int, b: Int): Int {
         return a + b - n
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt.after
index 5d02aea73eb..298af37095d 100644
--- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt.after
@@ -4,6 +4,6 @@
 // PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in foo
 fun foo(a: Int, b: Int) = i(a, b) - 1
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return a + b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after
index f993539f5e9..de79125b4ca 100644
--- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after
@@ -3,6 +3,6 @@
 val n = 1
 fun foo(a: Int, b: Int = i(a)) = a + b - 1
 
-fun i(a: Int): Int {
+private fun i(a: Int): Int {
     return a + n
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after
index b6f720418f8..94de47c5168 100644
--- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after
@@ -3,6 +3,6 @@
 val n = 1
 fun foo(a: Int, b: Int = { i(a) }) = a + b - 1
 
-fun i(a: Int): Int {
+private fun i(a: Int): Int {
     return a + n
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt.after
index c2e41a33eaf..06103916308 100644
--- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt.after
@@ -4,6 +4,6 @@
 // PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in foo
 fun foo(a: Int, b: Int) = { i(a, b) - 1 }.invoke()
 
-fun i(a: Int, b: Int): Int {
+private fun i(a: Int, b: Int): Int {
     return a + b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after
index 5ffedad25c2..aa845ac1c95 100644
--- a/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after
@@ -3,7 +3,7 @@
 class A(val a: Int, b: Int) {
     val foo = i(b) - 1
 
-    fun i(b: Int): Int {
+    private fun i(b: Int): Int {
         return a + b
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after
index ad33caea766..a57f0927b71 100644
--- a/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after
@@ -3,7 +3,7 @@
 class A(val a: Int, b: Int) {
     val foo = { i(b) - 1 }.invoke()
 
-    fun i(b: Int): Int {
+    private fun i(b: Int): Int {
         return a + b
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt.after
index 5ba436cb627..cd460da332a 100644
--- a/idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt.after
@@ -2,6 +2,6 @@ val a = 1
 val b = 1
 val foo = i() - 1
 
-fun i(): Int {
+private fun i(): Int {
     return a + b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt.after
index 9567c376812..d353623e271 100644
--- a/idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt.after
+++ b/idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt.after
@@ -2,6 +2,6 @@ val a = 1
 val b = 1
 val foo = { i() - 1 }.invoke()
 
-fun i(): Int {
+private fun i(): Int {
     return a + b
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after
index 0c2675aee5f..15b0019ac81 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after
@@ -15,6 +15,6 @@ fun foo(s: String?, x: X<Any>) {
     }
 }
 
-fun unit(s: String, x: X<Any>) {
+private fun unit(s: String, x: X<Any>) {
     x.add(s)
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after
index 9027ca40ee7..fa7602cd4fa 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after
@@ -15,6 +15,6 @@ fun foo(s: String?, x: X<Any?>) {
     }
 }
 
-fun unit(s: String?, x: X<Any?>) {
+private fun unit(s: String?, x: X<Any?>) {
     x.add(s)
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after
index e299069fdaa..2218fb879aa 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after
@@ -35,6 +35,6 @@ fun foo(c: C) {
     c.doC()
 }
 
-fun unit(c: C) {
+private fun unit(c: C) {
     c.doA()
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after
index 6fb0459c531..92ab1f15b70 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after
@@ -35,6 +35,6 @@ fun foo(c: C) {
     c.doC()
 }
 
-fun unit(c: C) {
+private fun unit(c: C) {
     c.doB()
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after
index 3778a2f8176..261440e3ab1 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after
@@ -35,6 +35,6 @@ fun foo(c: C) {
     unit(c)
 }
 
-fun unit(c: C) {
+private fun unit(c: C) {
     c.doC()
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after
index 56d0af4a3d0..d68fceb28bd 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after
@@ -34,7 +34,7 @@ fun foo(c: C) {
     c.doC()
 }
 
-fun unit(c: C) {
+private fun unit(c: C) {
     c.doA()
     c.doB()
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after
index 45b9714d14e..982120eef76 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after
@@ -19,6 +19,6 @@ public class A(): Z() {
     }
 }
 
-fun i(a1: A, b1: A.B): Int {
+private fun i(a1: A, b1: A.B): Int {
     return a1.a + b1.b + a1.z + b1.z
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after
index 26673c55052..1baa3dabc9b 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after
@@ -7,6 +7,6 @@ fun Z.foo(): Int {
     return i() + 1
 }
 
-fun Z.i(): Int {
+private fun Z.i(): Int {
     return this.a
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after
index f678666134f..f9ccc19f7d5 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after
@@ -19,6 +19,6 @@ public class A(): Z() {
     }
 }
 
-fun i(a1: A, b1: A.B): Int {
+private fun i(a1: A, b1: A.B): Int {
     return a1.a + b1.b + b1.z
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after
index 45b9714d14e..982120eef76 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after
@@ -19,6 +19,6 @@ public class A(): Z() {
     }
 }
 
-fun i(a1: A, b1: A.B): Int {
+private fun i(a1: A, b1: A.B): Int {
     return a1.a + b1.b + a1.z + b1.z
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after
index 9bd1c3d5bd5..b9a52ffa800 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after
@@ -7,6 +7,6 @@ fun Z.foo(): Int {
     return i() + 1
 }
 
-fun Z.i(): Int {
+private fun Z.i(): Int {
     return this.a + a
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after
index 87c4b34588e..67702f4f54b 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after
@@ -7,6 +7,6 @@ fun Z.foo(): Int {
     return i() + 1
 }
 
-fun Z.i(): Int {
+private fun Z.i(): Int {
     return a
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after
index 0346fca7526..209f3130c15 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after
@@ -19,6 +19,6 @@ public class A(): Z() {
     }
 }
 
-fun i(a1: A, b1: A.B): Int {
+private fun i(a1: A, b1: A.B): Int {
     return a1.a + b1.b + b1.z
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after
index fb69d272c3d..fe375cc9a6e 100644
--- a/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after
@@ -9,6 +9,6 @@ fun foo(t: Array<Array<Int>>) {
     }
 }
 
-fun i(it: Int): Int {
+private fun i(it: Int): Int {
     return it + 1
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after
index ba8e546e599..20efe186be4 100644
--- a/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after
@@ -9,6 +9,6 @@ fun foo(t: Array<Int>) {
     }
 }
 
-fun b(t: Array<Int>): Boolean {
+private fun b(t: Array<Int>): Boolean {
     return t.check { it + 1 > 1 }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after
index 9707684fa9f..a330c422ccb 100644
--- a/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after
@@ -9,6 +9,6 @@ fun foo(t: Array<Array<Int>>) {
     }
 }
 
-fun b(it: Array<Int>): Boolean {
+private fun b(it: Array<Int>): Boolean {
     return it.check { it + 1 > 1 }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after
index 2d7b4d3606a..f6b2710b69b 100644
--- a/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after
@@ -9,6 +9,6 @@ fun foo(t: Array<Int>) {
     }
 }
 
-fun i(it: Int): Int {
+private fun i(it: Int): Int {
     return it + 1
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt.after
index 5ed77ab127d..7749a5bb993 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt.after
@@ -13,7 +13,7 @@ class MyClass {
     }
 }
 
-fun i(): Int {
+private fun i(): Int {
     MyClass.coFun()
     return MyClass.coProp + 10
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt.after
index 2b66ffda01b..9ed66f675fe 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt.after
@@ -15,7 +15,7 @@ class A {
     }
 }
 
-fun i(): Int {
+private fun i(): Int {
     A.B.coFun()
     return A.B.coProp + 10
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/kt5001.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/kt5001.kt.after
index 3824d091dd1..21b5627419b 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/kt5001.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/kt5001.kt.after
@@ -10,7 +10,7 @@ fun main(args: Array<String>) {
     else false
 }
 
-fun b(): Boolean {
+private fun b(): Boolean {
     val al = 0
     return al.bar(1)
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after
index 7da29ff775d..6fafc150a50 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after
@@ -6,7 +6,7 @@ fun main(args: Array<String>) {
     unit(a)
 }
 
-fun unit(a: Int) {
+private fun unit(a: Int) {
     a
 }
 
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after
index f6581a57116..1148a942e81 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after
@@ -9,6 +9,6 @@ fun foo(a: Int, b: Int, c: Int): Int {
     return i(a, b, c)
 }
 
-fun i(a: Int, b: Int, c: Int): Int {
+private fun i(a: Int, b: Int, c: Int): Int {
     return (a + b * a - c) + b * c
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedAnnotation.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedAnnotation.kt.after
index 3f8fe319547..0e86ee905d0 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedAnnotation.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedAnnotation.kt.after
@@ -7,7 +7,7 @@ class MyClass {
     public annotation class P
 }
 
-fun unit() {
+private fun unit() {
     [MyClass.P] val t: Int = 1
     t
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt.after
index b36c9c68ecf..7606de1536a 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt.after
@@ -12,7 +12,7 @@ class MyClass {
     }
 }
 
-fun unit() {
+private fun unit() {
     MyClass.P.foo()
     MyClass.P.a
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedEnum.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedEnum.kt.after
index 2a5e41988a6..37a102224a7 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedEnum.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedEnum.kt.after
@@ -12,7 +12,7 @@ class MyClass {
     }
 }
 
-fun unit() {
+private fun unit() {
     MyClass.P.A.foo()
     MyClass.P.A.a
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedObject.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedObject.kt.after
index 45629b9938f..a436ceca5d7 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedObject.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedObject.kt.after
@@ -10,7 +10,7 @@ class MyClass {
     }
 }
 
-fun unit() {
+private fun unit() {
     MyClass.P.foo()
     MyClass.P.a
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedPackage.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedPackage.kt.after
index a5c5411f765..10bc51bf7cb 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedPackage.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedPackage.kt.after
@@ -10,7 +10,7 @@ class MyClass {
     }
 }
 
-fun unit() {
+private fun unit() {
     foo()
     a
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeArg.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeArg.kt.after
index a7974d97740..ad14a712a1e 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeArg.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeArg.kt.after
@@ -11,6 +11,6 @@ class MyClass {
     }
 }
 
-fun unit() {
+private fun unit() {
     val t: MyClass.P<MyClass.P.Q>? = null
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeInValueArg.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeInValueArg.kt.after
index 7b7ccee5096..dcfb19979b8 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeInValueArg.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeInValueArg.kt.after
@@ -15,7 +15,7 @@ class MyClass {
     }
 }
 
-fun unit() {
+private fun unit() {
     val a: Any = MyClass.P.Q()
     val t = MyClass.P.R<MyClass.P.Q>(a as MyClass.P.Q)
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeRef.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeRef.kt.after
index 3b1f0607e09..39821265341 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeRef.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeRef.kt.after
@@ -11,7 +11,7 @@ class MyClass {
     }
 }
 
-fun unit() {
+private fun unit() {
     val t: MyClass.P.Q = MyClass.P.Q()
     t
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt.after
index 691caa1d8bf..f78c08d1a8a 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt.after
@@ -6,7 +6,7 @@ fun foo(a: Int, b: Int): Int {
     return 0
 }
 
-fun b(a: Int): Boolean {
+private fun b(a: Int): Boolean {
     if (a > 0) return true
     return false
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/typeRef.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/typeRef.kt.after
index 60d1ca0eb20..e851008526e 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/typeRef.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/typeRef.kt.after
@@ -7,7 +7,7 @@ class MyClass {
     public class P
 }
 
-fun unit() {
+private fun unit() {
     val t: MyClass.P = MyClass.P()
     t
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after
index 39373c77c3f..fc26f5cd677 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after
@@ -13,7 +13,7 @@ public class A() {
     }
 }
 
-fun i(a: A, t: Int, u: Int, x: Int): Int {
+private fun i(a: A, t: Int, u: Int, x: Int): Int {
     return a.bar(t - x, u + x)
 }
 
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt.after
index 37623971cef..83d5d8c066c 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt.after
@@ -9,6 +9,6 @@ fun testProp() {
     unit(foo)
 }
 
-fun unit(foo: A) {
+private fun unit(foo: A) {
     foo()
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after
index ea873156f44..4a73a17e311 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after
@@ -9,6 +9,6 @@ fun foo<V: Data>(v: V): Pair<Int, V> {
     return pair(v)
 }
 
-fun <V : Data> pair(v: V): Pair<Int, V> {
+private fun <V : Data> pair(v: V): Pair<Int, V> {
     return Pair(v.x + 10, v)
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after
index fd4a9e080bc..4fbb64dabd9 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after
@@ -10,6 +10,6 @@ fun foo<V: Data>(v: V): Pair<Int, V> where V: DataEx {
     return pair(v)
 }
 
-fun <V : Data> pair(v: V): Pair<Int, V> where V : DataEx {
+private fun <V : Data> pair(v: V): Pair<Int, V> where V : DataEx {
     return Pair(v.x + 10, v)
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after
index b6429463f33..a84e42aa78b 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after
@@ -9,6 +9,6 @@ class A<T> {
     }
 }
 
-fun <T> i(d: Data<T>): Int {
+private fun <T> i(d: Data<T>): Int {
     return d.t + 1
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
index b4ca7d69fdd..e1b437681ae 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
@@ -17,6 +17,6 @@ class A<T: Data>(val t: T) where T: DataEx {
     }
 }
 
-fun <T : Data, U : Data, V : Data> i(a: A<T>, b: A.B<U>, v: V): Int where T : DataEx, U : DataExEx, V : DataEx {
+private fun <T : Data, U : Data, V : Data> i(a: A<T>, b: A.B<U>, v: V): Int where T : DataEx, U : DataExEx, V : DataEx {
     return a.t.x + b.u.x + v.x
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after
index 06f24b45af5..1e07f2964fd 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after
@@ -14,7 +14,7 @@ class A<T: Data>(val t: T) where T: DataEx {
         }
     }
 
-    fun <U : Data, V : Data> B<U>.i(v: V): Int where U : DataExEx, V : DataEx {
+    private fun <U : Data, V : Data> B<U>.i(v: V): Int where U : DataExEx, V : DataEx {
         return t.x + u.x + v.x
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after
index 3e0b4adef08..e0406501ddd 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after
@@ -11,7 +11,7 @@ class A<T: Data>(val t: T) where T: DataEx {
             return i(v)
         }
 
-        fun <V : Data> i(v: V): Int where V : DataEx {
+        private fun <V : Data> i(v: V): Int where V : DataEx {
             return t.x + u.x + v.x
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
index ea4fd6cbe69..2f611906e74 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
@@ -15,6 +15,6 @@ class A<T: Data>(val t: T) {
     }
 }
 
-fun <T : Data, U : Data, V : Data> i(a: A<T>, b: A.B<U>, v: V): Int {
+private fun <T : Data, U : Data, V : Data> i(a: A<T>, b: A.B<U>, v: V): Int {
     return a.t.x + b.u.x + v.x
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after
index afdf10b177b..54c4810add5 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after
@@ -12,7 +12,7 @@ class A<T: Data>(val t: T) {
         }
     }
 
-    fun <U : Data, V : Data> B<U>.i(v: V): Int {
+    private fun <U : Data, V : Data> B<U>.i(v: V): Int {
         return t.x + u.x + v.x
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after
index cd480e56607..c9b688b9896 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after
@@ -9,7 +9,7 @@ class A<T: Data>(val t: T) {
             return i(v)
         }
 
-        fun <V : Data> i(v: V): Int {
+        private fun <V : Data> i(v: V): Int {
             return t.x + u.x + v.x
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
index 3122ddcf9ed..1b92e450422 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
@@ -12,6 +12,6 @@ class A<T: Data>(val t: T) where T: DataEx {
     }
 }
 
-fun <T : Data, V : Data> A<T>.i(v: V): Int where T : DataEx {
+private fun <T : Data, V : Data> A<T>.i(v: V): Int where T : DataEx {
     return t.x + v.x
 }
\ No newline at end of file