From 3e3918ab6e4cf70b08d9ceda129442bbb4487633 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 1 Jul 2014 14:23:59 +0400 Subject: [PATCH] Extract Function: Keep track of original parameter descriptors --- .../extractFunction/ExtractionDescriptor.kt | 2 ++ .../extractFunction/extractFunctionUtils.kt | 3 ++- .../extractFunction/basic/fragmentWithComment.kt | 1 + .../basic/fragmentWithComment.kt.after | 1 + .../basic/fragmentWithMultilineComment.kt | 1 + .../basic/fragmentWithMultilineComment.kt.after | 1 + .../extractFunction/basic/refInReturn.kt | 1 + .../extractFunction/basic/refInReturn.kt.after | 1 + .../conditionalJumps/conditionalBreakWithIf.kt | 2 ++ .../conditionalBreakWithIf.kt.after | 2 ++ .../conditionalJumps/conditionalBreakWithIfElse.kt | 2 ++ .../conditionalBreakWithIfElse.kt.after | 2 ++ .../conditionalJumps/conditionalBreakWithWhen.kt | 2 ++ .../conditionalBreakWithWhen.kt.after | 2 ++ .../conditionalJumps/conditionalReturnWithIf.kt | 2 ++ .../conditionalReturnWithIf.kt.after | 2 ++ .../conditionalReturnWithIfElse.kt | 2 ++ .../conditionalReturnWithIfElse.kt.after | 2 ++ .../conditionalJumps/conditionalReturnWithWhen.kt | 2 ++ .../conditionalReturnWithWhen.kt.after | 2 ++ .../conditionalJumps/unconditionalBreakWithIf.kt | 2 ++ .../unconditionalBreakWithIf.kt.after | 2 ++ .../unconditionalBreakWithIfElse.kt | 2 ++ .../unconditionalBreakWithIfElse.kt.after | 2 ++ .../conditionalJumps/unconditionalBreakWithWhen.kt | 2 ++ .../unconditionalBreakWithWhen.kt.after | 2 ++ .../controlFlow/default/defaultCF.kt | 2 ++ .../controlFlow/default/defaultCF.kt.after | 2 ++ .../controlFlow/default/defaultCFWithJumps.kt | 1 + .../default/defaultCFWithJumps.kt.after | 1 + .../default/ignoredReturnValueWithIf.kt | 2 ++ .../default/ignoredReturnValueWithIf.kt.after | 2 ++ .../default/ignoredReturnValueWithIfNoBlocks.kt | 2 ++ .../ignoredReturnValueWithIfNoBlocks.kt.after | 2 ++ .../default/ignoredReturnValueWithWhen.kt | 2 ++ .../default/ignoredReturnValueWithWhen.kt.after | 2 ++ .../default/ignoredReturnValueWithWhenNoBlocks.kt | 2 ++ .../ignoredReturnValueWithWhenNoBlocks.kt.after | 2 ++ .../definiteReturns/definiteReturnWithIf.kt | 2 ++ .../definiteReturns/definiteReturnWithIf.kt.after | 2 ++ .../definiteReturns/definiteReturnWithWhen.kt | 2 ++ .../definiteReturnWithWhen.kt.after | 2 ++ .../definiteReturns/singleDefiniteReturn.kt | 2 ++ .../definiteReturns/singleDefiniteReturn.kt.after | 2 ++ .../evaluateExpression/evalExprInIfCondition.kt | 2 ++ .../evalExprInIfCondition.kt.after | 2 ++ .../evaluateExpression/evalExprInIfElse.kt | 2 ++ .../evaluateExpression/evalExprInIfElse.kt.after | 2 ++ .../evaluateExpression/evalExprInWhenBranch.kt | 1 + .../evalExprInWhenBranch.kt.after | 1 + .../evaluateExpression/evalExprInWhenSubject.kt | 2 ++ .../evalExprInWhenSubject.kt.after | 2 ++ .../evalExpressionBodyFunction.kt | 2 ++ .../evalExpressionBodyFunction.kt.after | 2 ++ .../controlFlow/evaluateExpression/evalIfExpr.kt | 2 ++ .../evaluateExpression/evalIfExpr.kt.after | 2 ++ .../controlFlow/evaluateExpression/evalWhenExpr.kt | 2 ++ .../evaluateExpression/evalWhenExpr.kt.after | 2 ++ .../evaluateExpression/simpleEvalExpr.kt | 2 ++ .../evaluateExpression/simpleEvalExpr.kt.after | 2 ++ .../controlFlow/outputValues/singleOutputValue.kt | 2 ++ .../outputValues/singleOutputValue.kt.after | 2 ++ .../outputValues/singleOutputValueWithIf.kt | 2 ++ .../outputValues/singleOutputValueWithIf.kt.after | 2 ++ .../outputValues/singleOutputValueWithIfElse.kt | 2 ++ .../singleOutputValueWithIfElse.kt.after | 2 ++ .../outputValues/singleOutputValueWithWhen.kt | 2 ++ .../singleOutputValueWithWhen.kt.after | 2 ++ .../outputValues/singleOutputValueWithWhenElse.kt | 2 ++ .../singleOutputValueWithWhenElse.kt.after | 2 ++ .../controlFlow/throws/breakWithThrow.kt | 2 ++ .../controlFlow/throws/breakWithThrow.kt.after | 2 ++ .../controlFlow/throws/continueWithThrow.kt | 2 ++ .../controlFlow/throws/continueWithThrow.kt.after | 2 ++ .../controlFlow/throws/evalExpressionWithThrow.kt | 2 ++ .../throws/evalExpressionWithThrow.kt.after | 2 ++ .../controlFlow/throws/nonValuedReturnWithThrow.kt | 2 ++ .../throws/nonValuedReturnWithThrow.kt.after | 2 ++ .../controlFlow/throws/outputValueWithThrow.kt | 1 + .../throws/outputValueWithThrow.kt.after | 1 + .../controlFlow/throws/returnWithThrow.kt | 2 ++ .../controlFlow/throws/returnWithThrow.kt.after | 2 ++ .../defaultContainer/classFunction.kt | 2 ++ .../defaultContainer/classFunction.kt.after | 2 ++ .../extractFunction/defaultContainer/lambda.kt | 2 ++ .../defaultContainer/lambda.kt.after | 2 ++ .../defaultContainer/nestedLambda.kt | 2 ++ .../defaultContainer/nestedLambda.kt.after | 2 ++ .../defaultContainer/topLevelFunction.kt | 2 ++ .../defaultContainer/topLevelFunction.kt.after | 2 ++ .../delegation/delegationByExpression.kt | 2 ++ .../delegation/delegationByExpression.kt.after | 2 ++ .../delegation/delegationByExpressionFull.kt | 1 + .../delegation/delegationByExpressionFull.kt.after | 1 + .../delegation/delegationBySuperCall.kt | 2 ++ .../delegation/delegationBySuperCall.kt.after | 2 ++ .../initializers/classes/classInitializer.kt | 1 + .../initializers/classes/classInitializer.kt.after | 1 + .../classes/classInitializerWithLambda.kt | 1 + .../classes/classInitializerWithLambda.kt.after | 1 + .../initializers/classes/classParameters.kt | 1 + .../initializers/classes/classParameters.kt.after | 1 + .../classes/classParametersWithLambda.kt | 1 + .../classes/classParametersWithLambda.kt.after | 1 + .../initializers/functions/localFunction.kt | 2 ++ .../initializers/functions/localFunction.kt.after | 2 ++ .../functions/localFunctionWithLambda.kt | 2 ++ .../functions/localFunctionWithLambda.kt.after | 2 ++ .../initializers/functions/memberFunction.kt | 2 ++ .../initializers/functions/memberFunction.kt.after | 2 ++ .../functions/memberFunctionParameters.kt | 1 + .../functions/memberFunctionParameters.kt.after | 1 + .../memberFunctionParametersWithLambda.kt | 1 + .../memberFunctionParametersWithLambda.kt.after | 1 + .../functions/memberFunctionWithLambda.kt | 2 ++ .../functions/memberFunctionWithLambda.kt.after | 2 ++ .../initializers/functions/topLevelFunction.kt | 2 ++ .../functions/topLevelFunction.kt.after | 2 ++ .../functions/topLevelFunctionParameters.kt | 1 + .../functions/topLevelFunctionParameters.kt.after | 1 + .../topLevelFunctionParametersWithLambda.kt | 1 + .../topLevelFunctionParametersWithLambda.kt.after | 1 + .../functions/topLevelFunctionWithLambda.kt | 2 ++ .../functions/topLevelFunctionWithLambda.kt.after | 2 ++ .../initializers/properties/memberProperty.kt | 1 + .../properties/memberProperty.kt.after | 1 + .../properties/memberPropertyWithLambda.kt | 1 + .../properties/memberPropertyWithLambda.kt.after | 1 + .../parameters/candidateTypes/nonNullableTypes.kt | 2 ++ .../candidateTypes/nonNullableTypes.kt.after | 2 ++ .../parameters/candidateTypes/nullableTypes.kt | 2 ++ .../candidateTypes/nullableTypes.kt.after | 2 ++ .../parameters/candidateTypes/typeHierarchy1.kt | 1 + .../candidateTypes/typeHierarchy1.kt.after | 1 + .../parameters/candidateTypes/typeHierarchy2.kt | 1 + .../candidateTypes/typeHierarchy2.kt.after | 1 + .../parameters/candidateTypes/typeHierarchy3.kt | 1 + .../candidateTypes/typeHierarchy3.kt.after | 1 + .../parameters/candidateTypes/typeHierarchy4.kt | 1 + .../candidateTypes/typeHierarchy4.kt.after | 1 + .../extractThis/explicitLabeledThisInMember.kt | 2 ++ .../explicitLabeledThisInMember.kt.after | 2 ++ .../extractThis/explicitThisInExtension.kt | 1 + .../extractThis/explicitThisInExtension.kt.after | 1 + .../parameters/extractThis/explicitThisInMember.kt | 2 ++ .../extractThis/explicitThisInMember.kt.after | 2 ++ .../implicitAndExplicitLabeledThisInMember.kt | 2 ++ ...implicitAndExplicitLabeledThisInMember.kt.after | 2 ++ .../implicitAndExplicitThisInExtension.kt | 1 + .../implicitAndExplicitThisInExtension.kt.after | 1 + .../extractThis/implicitThisInExtension.kt | 1 + .../extractThis/implicitThisInExtension.kt.after | 1 + .../parameters/extractThis/implicitThisInMember.kt | 2 ++ .../extractThis/implicitThisInMember.kt.after | 2 ++ .../extractFunction/parameters/it/innerIt.kt | 1 + .../extractFunction/parameters/it/innerIt.kt.after | 1 + .../extractFunction/parameters/it/lambdaWithIt.kt | 1 + .../parameters/it/lambdaWithIt.kt.after | 1 + .../extractFunction/parameters/it/outerIt.kt | 1 + .../extractFunction/parameters/it/outerIt.kt.after | 1 + .../extractFunction/parameters/it/simpleIt.kt | 1 + .../parameters/it/simpleIt.kt.after | 1 + .../parameters/misc/multiDeclaration.kt | 1 + .../parameters/misc/multiDeclaration.kt.after | 1 + .../parameters/misc/multipleOccurrences.kt | 3 +++ .../parameters/misc/multipleOccurrences.kt.after | 3 +++ .../parameters/misc/usagesInCallArgs.kt | 4 ++++ .../parameters/misc/usagesInCallArgs.kt.after | 4 ++++ .../parameters/misc/variableAsFunction.kt | 1 + .../parameters/misc/variableAsFunction.kt.after | 1 + .../typeParameters/simpleTypeParameter.kt | 1 + .../typeParameters/simpleTypeParameter.kt.after | 1 + .../simpleTypeParameterWithConstraint.kt | 1 + .../simpleTypeParameterWithConstraint.kt.after | 1 + .../typeParameters/typeParamInArgument.kt | 1 + .../typeParameters/typeParamInArgument.kt.after | 1 + .../typeParametersAndConstraintsCombined1.kt | 3 +++ .../typeParametersAndConstraintsCombined1.kt.after | 3 +++ .../typeParametersAndConstraintsCombined2.kt | 2 ++ .../typeParametersAndConstraintsCombined2.kt.after | 2 ++ .../typeParametersAndConstraintsCombined3.kt | 1 + .../typeParametersAndConstraintsCombined3.kt.after | 1 + .../typeParameters/typeParametersCombined1.kt | 3 +++ .../typeParametersCombined1.kt.after | 3 +++ .../typeParameters/typeParametersCombined2.kt | 2 ++ .../typeParametersCombined2.kt.after | 2 ++ .../typeParameters/typeParametersCombined3.kt | 1 + .../typeParametersCombined3.kt.after | 1 + .../typeParametersCombinedAndThis.kt | 2 ++ .../typeParametersCombinedAndThis.kt.after | 2 ++ .../introduceVariable/AbstractJetExtractionTest.kt | 14 ++++++++------ 191 files changed, 328 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionDescriptor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionDescriptor.kt index b2dcc422396..bb2ad696078 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionDescriptor.kt +++ b/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 diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt index ed26a90a33b..70b910c2de7 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt +++ b/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) diff --git a/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt b/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt index 3372cfd9265..e2b147cfee0 100644 --- a/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt +++ b/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 { // test diff --git a/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt.after b/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt.after index b8aaaec2df4..76f0c127848 100644 --- a/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt b/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt index 1a112d5181b..a0fac1bd688 100644 --- a/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt +++ b/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 { /* diff --git a/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt.after b/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt.after index 1879862bb0a..cfd9a61db18 100644 --- a/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/basic/refInReturn.kt b/idea/testData/refactoring/extractFunction/basic/refInReturn.kt index 029b2dca931..196584a9d01 100644 --- a/idea/testData/refactoring/extractFunction/basic/refInReturn.kt +++ b/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 { println(a) diff --git a/idea/testData/refactoring/extractFunction/basic/refInReturn.kt.after b/idea/testData/refactoring/extractFunction/basic/refInReturn.kt.after index e9052bbf124..e07b4bfdb7f 100644 --- a/idea/testData/refactoring/extractFunction/basic/refInReturn.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt index 0963d801a51..c501de95c2b 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after index 3efbe1b4c57..48637879611 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt index 92d438a0062..5ffddbd88c5 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after index 867bfdceda6..1ff929c2371 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt index f564b6bf2df..77b562cc6de 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after index 239d825363d..122f62a5f40 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt index 3158bd16036..3a1c155f753 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after index 154bd1413a6..647d6e30ee6 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt index 819f00074b8..56df09f7903 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after index 0ef66d95783..2536df0ea86 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt index 741510eda5a..8e8a25cb8b9 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after index 7e4c43b906e..ee6428f6542 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt index 1af325848c9..42fe30b83f1 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after index 580507294f3..ce7431197f9 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt index ceddd650382..142eb50970f 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after index fb152f9057a..6f72aa7fa72 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt index a5ff642baa0..237d8d137cf 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after index 1d272a7ca5d..766a3174a34 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt index 626f08973f4..7301c63ad33 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int, Comparable // PARAM_TYPES: kotlin.Int, Number, Comparable, 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after index 4ccdf286943..2ed8c35aaa1 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int, Comparable // PARAM_TYPES: kotlin.Int, Number, Comparable, 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt index 7dcfff262f3..fae6d89d3b5 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt.after index f032a9a01d5..5f5b6d574f7 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt index 7b4ae2ec974..a933e4c50be 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after index b7eca1131bd..9f99d56a74f 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt index 7ee6d3ef64d..c36096d32b2 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after index 2c123ba930f..e41b8f6430d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt index e4e643561b5..96e6d96b10e 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after index e6422989354..cd3496f872a 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt index 3b98c0fc77c..8d05a0f448a 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after index bf7a312045e..488f20e708a 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt index 3984a3238a6..7f4b7bf9545 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after index fce0d54ffba..85e4d82bb3d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt index 8b3ddc1ca47..22aaf79b430 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after index cf488a71e8f..f60fd2eb8ee 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt index 43084f4ef5e..692161f2e2e 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after index 3b3bc9b1e0c..b450e6a6a91 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt index a84a001f9d2..e1e92e23b19 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after index 594bee9b23e..7fb18200d06 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt index d5df8a1f9af..7609ae420b1 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after index ec9b09d88a7..de6d7082d55 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt index 6bd445a3073..50d54e0b008 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after index ae9d877f7ce..2af79bde459 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt index c6a90882e00..cc05e54fe86 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after index 3a3bd47e9d4..0a25b06dcd3 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt index b3b22875daf..bcc8275014a 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt +++ b/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 = 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 3a7fc579e04..be1d2e97946 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after +++ b/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) diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt index 66668cd0b4b..1c7d1726c5d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt +++ 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after index 61c2300399c..f54c207bce0 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt index b3e1079cea2..f3c4709bf86 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after index 42d92c15c5c..9c3b692438d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt index d42e002c5c0..549cfa82cfd 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after index 3b3bc9b1e0c..b450e6a6a91 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt index 50f8e17ccfa..b23b8196fe9 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after index f125443db71..d5046bc5075 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt index 2d7a4b3b1c6..624fcb641b9 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int, Comparable // 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after index 34458f1ff65..54c68a2cbeb 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int, Comparable // 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt index c42c15350e1..482047cb942 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after index c4af982ba6b..492f2857aa0 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt index c804d9d1eb2..e09d1debcb9 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int, Comparable // 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after index a2ce6551c1c..5c43efb80f4 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int, Comparable // 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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt index e49a2b0e424..7546bf110d5 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after index 70755a7e64d..948921f4313 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt b/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt index 4d97b3dae34..2f6cc075ef3 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after index 1849ddf19f7..814788a847c 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt b/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt index 8b775628609..fa1a256555f 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after index 35e7cbd7555..f62434ac429 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt b/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt index e3ac46dc63a..582d835301d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after index a31337f0084..a61342d658d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt b/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt index 5e830e28a1d..e6acca1d183 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after index c11246bb9dc..719caeee060 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt b/idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt index 06211d31505..b2c4ce62591 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt.after index 466c582391d..d8b8bfbaf84 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt b/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt index d0c974d147a..aee9beb9b8f 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after index 9fed3c2fe1b..08d2ec3c365 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after +++ b/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 diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt b/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt index 6cf938ac03d..2f987f6dc18 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt +++ b/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 { diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after index efd25e31a75..c991b08a509 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after +++ b/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 { diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt b/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt index 1c1070c5263..cd75d5d8721 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt +++ b/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 { diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after index ab1bba694f2..2368a642692 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after +++ b/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 { diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt b/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt index e0cc8a0a7fe..a12b1546448 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt +++ b/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 { diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after index da2cfce733a..e4d9d760e16 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after +++ b/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 { diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt b/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt index 943cd2cb1de..30e21f6df70 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt +++ b/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 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 ae7efed9cba..0777e9e3f9a 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after +++ b/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) } diff --git a/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt b/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt index 0157c97a732..1734e9b3f2d 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt +++ 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. +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in B. trait T class A(a: Int, b: Int): T diff --git a/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after b/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after index 11bd6aa9b8d..587042480fd 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after +++ b/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. +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in B. trait T class A(a: Int, b: Int): T diff --git a/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt b/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt index 4a9bb6359eb..027c6e60ebf 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt +++ b/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: T +// PARAM_DESCRIPTOR: value-parameter val t: T defined in B. trait T class A(a: Int, b: Int): T diff --git a/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after b/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after index 5f2bb9a4f87..aa8a2eee223 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after +++ b/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. trait T class A(a: Int, b: Int): T diff --git a/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt b/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt index 08d2d0ce774..642bf84da76 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt +++ b/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. +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in B. open class A(a: Int, b: Int) class B(a: Int, b: Int): A(a + b, a - b) \ 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 00097639f37..b842b5df52d 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after +++ 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. +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in B. open class A(a: Int, b: Int) class B(a: Int, b: Int): A(i(a, b), a - b) diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt index 20f41f07c6f..2564a088f0c 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt +++ 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. class A(val a: Int, b: Int) { { println(a + b - 1) diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after index 3d0af6a90be..66871e2b1de 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after +++ b/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. class A(val a: Int, b: Int) { { println(i(b) - 1) diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt index fbb85b74d39..129e17ea534 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt +++ b/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. class A(val a: Int, b: Int) { { println({ a + b - 1 }.invoke()) diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after index d4dddef9e8b..63051ce24a1 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after +++ b/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. class A(val a: Int, b: Int) { { println({ i(b) - 1 }.invoke()) diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt b/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt index 9fb65acf445..3e603d57d65 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt @@ -1,3 +1,4 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A. val n = 1 class A(val a: Int, val b: Int = a + n) \ 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 cc6b994ff21..57fca38cac6 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A. val n = 1 class A(val a: Int, val b: Int = i(a)) diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt b/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt index 2558a47bb7b..51d6771e379 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt @@ -1,3 +1,4 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A. val n = 1 class A(val a: Int, val b: Int = { a + n }.invoke()) \ 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 e1bdbe61017..ddeb1e23f56 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A. val n = 1 class A(val a: Int, val b: Int = { i(a) }.invoke()) diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt b/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt index a29215deed8..6162020b336 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in bar.foo +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in bar.foo fun bar(n: Int) { fun foo(a: Int, b: Int) = a + b - n - 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt.after index ed463a927c6..5f228f4a57e 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in bar.foo +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in bar.foo fun bar(n: Int) { fun i(a: Int, b: Int): Int { return a + b - n diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt b/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt index 1e2dcf1a909..45d7d640521 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in bar.foo +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in bar.foo fun bar(n: Int) { fun foo(a: Int, b: Int) = { a + b - n - 1 }.invoke() } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt.after index a745b50e40e..555d9a5e042 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in bar.foo +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in bar.foo fun bar(n: Int) { fun i(a: Int, b: Int): Int { return a + b - n diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt index b0dc9a2e0c2..34e024b1376 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.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(val n: Int) { fun foo(a: Int, b: Int) = a + b - n - 1 } \ 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 01e7a30df4c..bddd825ae4a 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.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(val n: Int) { fun foo(a: Int, b: Int) = i(a, b) - 1 diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt index abe7bf80b9f..377a8db0258 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo class A(val n: Int) { fun foo(a: Int, b: Int = a + n) = a + b - n - 1 } \ 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 2f8377f54aa..b7a0195683e 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo class A(val n: Int) { fun foo(a: Int, b: Int = i(a)) = a + b - n - 1 diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt index cd25416fc1d..a81602b9b5d 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo class A(val n: Int) { fun foo(a: Int, b: Int = { a + n }.invoke()) = a + b - n - 1 } \ 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 b399f0e7418..b2b5ab817c6 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo class A(val n: Int) { fun foo(a: Int, b: Int = { i(a) }.invoke()) = a + b - n - 1 diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt index f679f5d2d8b..8c88ea48ea9 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.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(val n: Int) { fun foo(a: Int, b: Int) = { a + b - n - 1 }.invoke() } \ 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 1cc5c96880f..13fa5a00552 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.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(val n: Int) { fun foo(a: Int, b: Int) = { i(a, b) - 1 }.invoke() diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt index ed744df990b..e88b447b75e 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt @@ -1,3 +1,5 @@ // 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) = a + b - 1 \ 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 e0e23cff00d..5d02aea73eb 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/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) = i(a, b) - 1 fun i(a: Int, b: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt index 05d36159774..7c690498d51 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt @@ -1,3 +1,4 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo val n = 1 fun foo(a: Int, b: Int = a + n) = a + b - 1 \ 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 eee810246f5..f993539f5e9 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo val n = 1 fun foo(a: Int, b: Int = i(a)) = a + b - 1 diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt index 0a6d825e732..28c3412c7c8 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt @@ -1,3 +1,4 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo val n = 1 fun foo(a: Int, b: Int = { a + n }) = a + b - 1 \ 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 425608d054c..b6f720418f8 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo val n = 1 fun foo(a: Int, b: Int = { i(a) }) = a + b - 1 diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt index f5d7ab378a6..7a23ea7b423 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt @@ -1,3 +1,5 @@ // 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) = { a + b - 1 }.invoke() \ 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 1d3894bf255..c2e41a33eaf 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.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) = { i(a, b) - 1 }.invoke() fun i(a: Int, b: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt b/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt index 8b23e260300..026b0883114 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt +++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. class A(val a: Int, b: Int) { val foo = a + b - 1 } \ 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 f7a8045b7d3..5ffedad25c2 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. class A(val a: Int, b: Int) { val foo = i(b) - 1 diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt b/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt index 8d2549f325d..ac40df5f886 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. class A(val a: Int, b: Int) { val foo = { a + b - 1 }.invoke() } \ 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 10f4f2f5de2..ad33caea766 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. class A(val a: Int, b: Int) { val foo = { i(b) - 1 }.invoke() diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt index 4dafde070ed..3fb14d75d96 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.String, Comparable, CharSequence, kotlin.Any // PARAM_TYPES: X +// PARAM_DESCRIPTOR: value-parameter val s: kotlin.String? defined in foo +// PARAM_DESCRIPTOR: value-parameter val x: X defined in foo class X { fun add(t: T) { diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after index e16d1ea3903..0c2675aee5f 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.String, Comparable, CharSequence, kotlin.Any // PARAM_TYPES: X +// PARAM_DESCRIPTOR: value-parameter val s: kotlin.String? defined in foo +// PARAM_DESCRIPTOR: value-parameter val x: X defined in foo class X { fun add(t: T) { diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt index ce80d833f72..ebe8526bbf1 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.String?, kotlin.Comparable?, kotlin.CharSequence?, kotlin.Any? // PARAM_TYPES: X +// PARAM_DESCRIPTOR: value-parameter val s: kotlin.String? defined in foo +// PARAM_DESCRIPTOR: value-parameter val x: X defined in foo class X { fun add(t: T) { diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after index b3b116f5ad4..9027ca40ee7 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: kotlin.String?, kotlin.Comparable?, kotlin.CharSequence?, kotlin.Any? // PARAM_TYPES: X +// PARAM_DESCRIPTOR: value-parameter val s: kotlin.String? defined in foo +// PARAM_DESCRIPTOR: value-parameter val x: X defined in foo class X { fun add(t: T) { diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt index 0110855a2cf..ff2682a5d7f 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt @@ -1,4 +1,5 @@ //PARAM_TYPES: C, AImpl, A +//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo trait A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after index c0aa5718d2d..e299069fdaa 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after @@ -1,4 +1,5 @@ //PARAM_TYPES: C, AImpl, A +//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo trait A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt index c5d4010f69d..b1f131ac6cd 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt @@ -1,4 +1,5 @@ //PARAM_TYPES: C, B +//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo trait A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after index 96645ea7142..6fb0459c531 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after @@ -1,4 +1,5 @@ //PARAM_TYPES: C, B +//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo trait A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt index 578290918ab..a9b3756b8d5 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt @@ -1,4 +1,5 @@ //PARAM_TYPES: C +//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo trait A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after index 05d6290919b..3778a2f8176 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after @@ -1,4 +1,5 @@ //PARAM_TYPES: C +//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo trait A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt index e7495780bba..1a3cc6674fe 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt @@ -1,4 +1,5 @@ //PARAM_TYPES: C +//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo trait A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after index 75594210f4b..56d0af4a3d0 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after @@ -1,4 +1,5 @@ //PARAM_TYPES: C +//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo trait A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt index 55672bccccd..7bb637af780 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B +// PARAM_DESCRIPTOR: public final class A : Z defined in root package +// PARAM_DESCRIPTOR: public final inner class B : Z defined in A public open class Z { val z: Int = 0 } diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after index 19c2d063532..45b9714d14e 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B +// PARAM_DESCRIPTOR: public final class A : Z defined in root package +// PARAM_DESCRIPTOR: public final inner class B : Z defined in A public open class Z { val z: Int = 0 } diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt index f6aca51d5c7..25fe0b645b8 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: Z +// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package class Z(val a: Int) // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after index 051cb4833e7..26673c55052 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: Z +// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package class Z(val a: Int) // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt index c37338507bf..68d01ef1288 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B +// PARAM_DESCRIPTOR: public final class A : Z defined in root package +// PARAM_DESCRIPTOR: public final inner class B : Z defined in A public open class Z { val z: Int = 0 } diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after index 55bb2b0b28b..f678666134f 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B +// PARAM_DESCRIPTOR: public final class A : Z defined in root package +// PARAM_DESCRIPTOR: public final inner class B : Z defined in A public open class Z { val z: Int = 0 } diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt index 2d338b4b8fe..9545b785bb7 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B +// PARAM_DESCRIPTOR: public final class A : Z defined in root package +// PARAM_DESCRIPTOR: public final inner class B : Z defined in A public open class Z { val z: Int = 0 } diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after index 19c2d063532..45b9714d14e 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B +// PARAM_DESCRIPTOR: public final class A : Z defined in root package +// PARAM_DESCRIPTOR: public final inner class B : Z defined in A public open class Z { val z: Int = 0 } diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt index 171724d966b..275494e669e 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: Z +// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package class Z(val a: Int) // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after index 16cda1746fc..9bd1c3d5bd5 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: Z +// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package class Z(val a: Int) // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt index 2a8b91855c5..4c1cdd42d20 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: Z +// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package class Z(val a: Int) // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after index 9000c97c6a6..87c4b34588e 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: Z +// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package class Z(val a: Int) // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt index b6f4e488ce9..02a9913fee6 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B +// PARAM_DESCRIPTOR: public final class A : Z defined in root package +// PARAM_DESCRIPTOR: public final inner class B : Z defined in A public open class Z { val z: Int = 0 } diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after index 8c0a5e68db8..0346fca7526 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B +// PARAM_DESCRIPTOR: public final class A : Z defined in root package +// PARAM_DESCRIPTOR: public final inner class B : Z defined in A public open class Z { val z: Int = 0 } diff --git a/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt b/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt index a78c1a188cc..2bc3ec8fbea 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt +++ b/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo.. fun Array.check(f: (T) -> Boolean): Boolean = false // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after index 68d4a5e2af0..fb69d272c3d 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo.. fun Array.check(f: (T) -> Boolean): Boolean = false // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt b/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt index 5e2a55eec06..51340ac6a45 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt +++ b/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Array +// PARAM_DESCRIPTOR: value-parameter val t: kotlin.Array defined in foo fun Array.check(f: (T) -> Boolean): Boolean = false // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after index 6aa70ab366d..ba8e546e599 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Array +// PARAM_DESCRIPTOR: value-parameter val t: kotlin.Array defined in foo fun Array.check(f: (T) -> Boolean): Boolean = false // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt b/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt index 2022e6452c0..33ffa9a4929 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt +++ b/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Array +// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Array defined in foo. fun Array.check(f: (T) -> Boolean): Boolean = false // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after index f5c2eaa5e1b..9707684fa9f 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Array +// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Array defined in foo. fun Array.check(f: (T) -> Boolean): Boolean = false // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt b/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt index a81b51a5574..cff501a1820 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt +++ b/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. fun Array.check(f: (T) -> Boolean): Boolean = false // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after index bcdc0a3349a..2d7b4d3606a 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. fun Array.check(f: (T) -> Boolean): Boolean = false // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt b/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt index 35c49a8987e..1bd1db4dd6d 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt +++ b/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int, Number, Comparable, Any +// PARAM_DESCRIPTOR: val a: kotlin.Int defined in main // SIBLING: fun main(args: Array) { val (a, b) = Data(1, 2) diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after index 374ce76203e..7da29ff775d 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: kotlin.Int, Number, Comparable, Any +// PARAM_DESCRIPTOR: val a: kotlin.Int defined in main // SIBLING: fun main(args: Array) { val (a, b) = Data(1, 2) diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt b/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt index 6f824a05a7a..9d4e240a48b 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt +++ b/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt @@ -1,6 +1,9 @@ // PARAM_TYPES: kotlin.Int // 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 +// PARAM_DESCRIPTOR: value-parameter val c: kotlin.Int defined in foo // SIBLING: fun foo(a: Int, b: Int, c: Int): Int { return (a + b*a - c) + b*c diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after index 0a54daa0e54..f6581a57116 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after @@ -1,6 +1,9 @@ // PARAM_TYPES: kotlin.Int // 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 +// PARAM_DESCRIPTOR: value-parameter val c: kotlin.Int defined in foo // SIBLING: fun foo(a: Int, b: Int, c: Int): Int { return i(a, b, c) diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt b/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt index 6b381cd32b6..b765abaf06d 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt +++ b/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt @@ -2,6 +2,10 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: A defined in foo +// PARAM_DESCRIPTOR: val t: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: val u: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter val x: kotlin.Int defined in foo // SIBLING: public class A() { fun bar(a: Int, b: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after index 4b19703b654..39373c77c3f 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after @@ -2,6 +2,10 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int +// PARAM_DESCRIPTOR: value-parameter val a: A defined in foo +// PARAM_DESCRIPTOR: val t: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: val u: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter val x: kotlin.Int defined in foo // SIBLING: public class A() { fun bar(a: Int, b: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt b/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt index c2f7f75c3b8..2032da6fb46 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt +++ b/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: A +// PARAM_DESCRIPTOR: val foo: A defined in testProp class A { fun invoke() = 20 } diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt.after index 565522f7989..37623971cef 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: A +// PARAM_DESCRIPTOR: val foo: A defined in testProp class A { fun invoke() = 20 } diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt index b625943954d..923c22caff6 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: V +// PARAM_DESCRIPTOR: value-parameter val v: V defined in foo open class Data(val x: Int) class Pair(val a: A, val b: B) diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after index d0f22c861d5..ea873156f44 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: V +// PARAM_DESCRIPTOR: value-parameter val v: V defined in foo open class Data(val x: Int) class Pair(val a: A, val b: B) diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt index 32cc2939d3c..b023ebb0909 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: V +// PARAM_DESCRIPTOR: value-parameter val v: V defined in foo open class Data(val x: Int) trait DataEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after index 0a6fe47d0a8..fd4a9e080bc 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: V +// PARAM_DESCRIPTOR: value-parameter val v: V defined in foo open class Data(val x: Int) trait DataEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt index 57e94ee0871..239cb023180 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: Data +// PARAM_DESCRIPTOR: value-parameter val d: Data defined in A.foo class Data(val t: Int) // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after index 4a5fe65d03f..b6429463f33 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: Data +// PARAM_DESCRIPTOR: value-parameter val d: Data defined in A.foo class Data(val t: Int) // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt index 40ab68a7289..0d60a756c46 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt @@ -1,6 +1,9 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: internal final class A where T : Data defined in root package +// PARAM_DESCRIPTOR: internal final inner class B where U : Data defined in A +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) trait DataEx trait DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after index f5493f70dc8..b4ca7d69fdd 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after @@ -1,6 +1,9 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: internal final class A where T : Data defined in root package +// PARAM_DESCRIPTOR: internal final inner class B where U : Data defined in A +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) trait DataEx trait DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt index 1d669a511e8..3d3bd3b8275 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: A.B // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: internal final inner class B where U : Data defined in A +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) trait DataEx trait DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after index 98ea1f8394c..06f24b45af5 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: A.B // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: internal final inner class B where U : Data defined in A +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) trait DataEx trait DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt index 86d701ab736..166f611efee 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) trait DataEx trait DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after index 7d12e02d8b2..3e0b4adef08 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) trait DataEx trait DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt index 4b7a69df8c9..006bc9a80d8 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt @@ -1,6 +1,9 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: internal final class A defined in root package +// PARAM_DESCRIPTOR: internal final inner class B defined in A +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after index 82c63d9844b..ea4fd6cbe69 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after @@ -1,6 +1,9 @@ // PARAM_TYPES: A // PARAM_TYPES: A.B // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: internal final class A defined in root package +// PARAM_DESCRIPTOR: internal final inner class B defined in A +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt index 29f47a485c3..62558b37080 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: A.B // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: internal final inner class B defined in A +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) class A(val t: T) { diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after index 7f093f0d6c6..afdf10b177b 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: A.B // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: internal final inner class B defined in A +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) class A(val t: T) { diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt index 25804fef6a9..c2fcc37073f 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt @@ -1,4 +1,5 @@ // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) class A(val t: T) { diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after index 0b63c4e431b..cd480e56607 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after @@ -1,4 +1,5 @@ // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo open class Data(val x: Int) class A(val t: T) { diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt index e2290712601..818272b84bf 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt @@ -1,5 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: internal final class A where T : Data defined in root package +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo open class Data(val x: Int) trait DataEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after index 6f2f7c0681d..3122ddcf9ed 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after @@ -1,5 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: V, Data +// PARAM_DESCRIPTOR: internal final class A where T : Data defined in root package +// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo open class Data(val x: Int) trait DataEx diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt index 456534a3ee5..0b87b58b5a3 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt @@ -73,22 +73,24 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe } ) - val expectedParameterTypes = ArrayList() val fileText = file.getText() + val expectedDescriptors = + InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, "// PARAM_DESCRIPTOR: ").joinToString() val expectedTypes = - InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, "// PARAM_TYPES: ") - .mapTo(expectedParameterTypes) { "[$it]" } - .joinToString() + InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, "// PARAM_TYPES: ").map { "[$it]" }.joinToString() val renderer = DescriptorRenderer.DEBUG_TEXT val editor = fixture.getEditor() selectElements(editor, file) { (elements, previousSibling) -> ExtractKotlinFunctionHandler().doInvoke(editor, file, elements, explicitPreviousSibling ?: previousSibling) { - val actualTypes = (ContainerUtil.createMaybeSingletonList(it.receiverParameter) + it.parameters).map { - it.parameterTypeCandidates.map { renderer.renderType(it) }. joinToString(", ", "[", "]") + val allParameters = ContainerUtil.createMaybeSingletonList(it.receiverParameter) + it.parameters + val actualDescriptors = allParameters.map { renderer.render(it.originalDescriptor) }.joinToString() + val actualTypes = allParameters.map { + it.parameterTypeCandidates.map { renderer.renderType(it) }.joinToString(", ", "[", "]") }.joinToString() + assertEquals(expectedDescriptors, actualDescriptors, "Expected descriptors mismatch.") assertEquals(expectedTypes, actualTypes, "Expected types mismatch.") } }