Extract Function: Keep track of original parameter descriptors

idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionDescriptor.kt

@@ -34,9 +34,11 @@ import org.jetbrains.jet.lang.psi.JetTypeConstraint
 import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.Status
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle
 import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.ErrorMessage
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 
 trait Parameter {
     val argumentText: String
+    val originalDescriptor: DeclarationDescriptor
     val name: String
     val mirrorVarName: String?
     val parameterType: JetType

idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt

@@ -315,6 +315,7 @@ private fun JetType.processTypeIfExtractable(
 
 private class MutableParameter(
         override val argumentText: String,
+        override val originalDescriptor: DeclarationDescriptor,
         override val name: String,
         override val mirrorVarName: String?,
         override val receiverCandidate: Boolean
@@ -454,7 +455,7 @@ private fun ExtractionData.inferParametersInfo(
                             else
                                 (thisExpr ?: ref).getText() ?: throw AssertionError("'this' reference shouldn't be empty: code fragment = ${getCodeFragmentText()}")
 
-                    MutableParameter(argumentText, parameterName, mirrorVarName, extractThis)
+                    MutableParameter(argumentText, descriptorToExtract, parameterName, mirrorVarName, extractThis)
                 }
 
                 parameter.addDefaultType(parameterType)

idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     <selection>// test

idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt.after

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     if (b(a)) return a

idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     <selection>/*

idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt.after

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     if (b(a)) return a

idea/testData/refactoring/extractFunction/basic/refInReturn.kt

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     <selection>println(a)

idea/testData/refactoring/extractFunction/basic/refInReturn.kt.after

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     if (b(a)) return a

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int, Comparable<Int>
 // PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int) {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int, Comparable<Int>
 // PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int) {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int) {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt.after

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int) {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
     println(a)
     return a + 10

idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
     println(a)
     return a + 10

idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
     println(a)
     return a + 10

idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
     println(a)
     return a + 10

idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
     println(a)
     return a + 10

idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
     println(a)
     return a + 10

idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
     println(a)
     return a + 10

idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
     println(a)
     return a + 10

idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt

@@ -1,4 +1,6 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int, b: Int): Int = <selection>a + b</selection>

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int, b: Int): Int = i(a, b)
 

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int, Comparable<Int>
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int, Comparable<Int>
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int, Comparable<Int>
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int, Comparable<Int>
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int) {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int) {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt.after

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 // SIBLING:
 fun foo(a: Int): Int {
     val b: Int = 1

idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.B.foo
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A.B.foo
 class A {
     class B {
         fun foo(a: Int, b: Int): Int {

idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.B.foo
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A.B.foo
 class A {
     class B {
         fun foo(a: Int, b: Int): Int {

idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A.foo
 class A {
     fun foo(a: Int, b: Int): Int {
         return {

idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A.foo
 class A {
     fun foo(a: Int, b: Int): Int {
         return {

idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A.foo
 class A {
     fun foo(a: Int, b: Int): Int {
         return {

idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A.foo
 class A {
     fun foo(a: Int, b: Int): Int {
         return {

idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in foo
 fun foo(a: Int, b: Int): Int {
     return <selection>a + b - 1</selection>
 }

idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in foo
 fun foo(a: Int, b: Int): Int {
     return i(a, b)
 }

idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in B.<init>
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in B.<init>
 trait T
 
 class A(a: Int, b: Int): T

idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in B.<init>
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in B.<init>
 trait T
 
 class A(a: Int, b: Int): T

idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt

@@ -1,4 +1,5 @@
 // PARAM_TYPES: T
+// PARAM_DESCRIPTOR: value-parameter val t: T defined in B.<init>
 trait T
 
 class A(a: Int, b: Int): T

idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after

@@ -1,4 +1,5 @@
 // PARAM_TYPES: T
+// PARAM_DESCRIPTOR: value-parameter val t: T defined in B.<init>
 trait T
 
 class A(a: Int, b: Int): T

idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in B.<init>
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in B.<init>
 open class A(a: Int, b: Int)
 
 class B(a: Int, b: Int): A(<selection>a + b</selection>, a - b)

idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after

@@ -1,5 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in B.<init>
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in B.<init>
 open class A(a: Int, b: Int)
 
 class B(a: Int, b: Int): A(i(a, b), a - b)

idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A.<init>
 class A(val a: Int, b: Int) {
     {
         println(<selection>a + b</selection> - 1)

idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A.<init>
 class A(val a: Int, b: Int) {
     {
         println(i(b) - 1)

idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A.<init>
 class A(val a: Int, b: Int) {
     {
         println({ <selection>a + b</selection> - 1 }.invoke())

idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after

@@ -1,4 +1,5 @@
 // PARAM_TYPES: kotlin.Int
+// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A.<init>
 class A(val a: Int, b: Int) {
     {
         println({ i(b) - 1 }.invoke())