diff --git a/compiler/testData/renderer/Enum.kt b/compiler/testData/renderer/Enum.kt index 6433e6d2872..ac8701684a7 100644 --- a/compiler/testData/renderer/Enum.kt +++ b/compiler/testData/renderer/Enum.kt @@ -7,6 +7,6 @@ private enum class TheEnum(val rgb: Int) { //package rendererTest //private final enum class TheEnum : kotlin.Enum defined in rendererTest //private constructor TheEnum(rgb: kotlin.Int) defined in rendererTest.TheEnum -//value-parameter val rgb: kotlin.Int defined in rendererTest.TheEnum. +//value-parameter rgb: kotlin.Int defined in rendererTest.TheEnum. //enum entry VAL1 defined in rendererTest.TheEnum //private constructor VAL1() defined in rendererTest.TheEnum.VAL1 diff --git a/compiler/testData/renderer/FunctionTypesInSignature.kt b/compiler/testData/renderer/FunctionTypesInSignature.kt index 9c8e344c535..28f8515174a 100644 --- a/compiler/testData/renderer/FunctionTypesInSignature.kt +++ b/compiler/testData/renderer/FunctionTypesInSignature.kt @@ -27,13 +27,13 @@ fun (T.(Int) -> Unit).f8() { val Function0<(() -> Unit) -> (() -> Unit)>.p: Unit = Unit //package test //public fun (() -> kotlin.Unit).f1(f: () -> kotlin.Unit): () -> kotlin.Int defined in test -//value-parameter val f: () -> kotlin.Unit defined in test.f1 +//value-parameter f: () -> kotlin.Unit defined in test.f1 //public fun (() -> kotlin.Unit).f2(f: () -> kotlin.Unit): () -> kotlin.Int defined in test -//value-parameter val f: () -> kotlin.Unit defined in test.f2 +//value-parameter f: () -> kotlin.Unit defined in test.f2 //public fun ((() -> kotlin.Unit) -> kotlin.Unit).f3(f: () -> () -> kotlin.Unit): () -> () -> kotlin.Int defined in test -//value-parameter val f: () -> () -> kotlin.Unit defined in test.f3 +//value-parameter f: () -> () -> kotlin.Unit defined in test.f3 //public fun (() -> () -> kotlin.Unit).f4(f: (() -> kotlin.Unit, () -> kotlin.Unit) -> kotlin.Unit): (() -> kotlin.Unit) -> () -> kotlin.Unit defined in test -//value-parameter val f: (() -> kotlin.Unit, () -> kotlin.Unit) -> kotlin.Unit defined in test.f4 +//value-parameter f: (() -> kotlin.Unit, () -> kotlin.Unit) -> kotlin.Unit defined in test.f4 //public fun (() -> (() -> kotlin.Unit) -> () -> kotlin.Unit).f5(): kotlin.Unit defined in test //public fun (() -> (() -> kotlin.Unit) -> () -> kotlin.Unit)?.f6(): kotlin.Unit defined in test //public fun ((kotlin.Int) -> kotlin.Unit)?.f7(): kotlin.Unit defined in test diff --git a/compiler/testData/renderer/GlobalFunctions.kt b/compiler/testData/renderer/GlobalFunctions.kt index 54467a773de..3c104bef0f8 100644 --- a/compiler/testData/renderer/GlobalFunctions.kt +++ b/compiler/testData/renderer/GlobalFunctions.kt @@ -23,14 +23,14 @@ fun

funTypeParameterWithTwoUpperBounds() where P : Foo, P : Bar = 17 //public fun pub(): kotlin.Unit defined in rendererTest //internal fun int(): kotlin.String defined in rendererTest //public fun int2(vararg ints: kotlin.Int): kotlin.Int defined in rendererTest -//value-parameter vararg val ints: kotlin.Int defined in rendererTest.int2 +//value-parameter vararg ints: kotlin.Int defined in rendererTest.int2 //private fun prv(a: kotlin.String, b: kotlin.Int = ...): kotlin.Int defined in rendererTest -//value-parameter val a: kotlin.String defined in rendererTest.prv -//value-parameter val b: kotlin.Int = ... defined in rendererTest.prv +//value-parameter a: kotlin.String defined in rendererTest.prv +//value-parameter b: kotlin.Int = ... defined in rendererTest.prv //public fun kotlin.Int.ext(): kotlin.Int defined in rendererTest //public fun withTypeParam(a: kotlin.Array): kotlin.Int defined in rendererTest // defined in rendererTest.withTypeParam -//value-parameter val a: kotlin.Array defined in rendererTest.withTypeParam +//value-parameter a: kotlin.Array defined in rendererTest.withTypeParam //public interface Foo defined in rendererTest //public interface Bar defined in rendererTest //public fun

funTypeParameterWithTwoUpperBounds(): kotlin.Int where P : rendererTest.Bar defined in rendererTest diff --git a/compiler/testData/renderer/KeywordsInNames.kt b/compiler/testData/renderer/KeywordsInNames.kt index ae92a920ef9..04376b4241a 100644 --- a/compiler/testData/renderer/KeywordsInNames.kt +++ b/compiler/testData/renderer/KeywordsInNames.kt @@ -24,14 +24,14 @@ val NOT_IS = 3 //public final class `class`<`in`> defined in root package //<`in`> defined in `class` //public constructor `class`<`in`>(p: `in`?) defined in `class` -//value-parameter val p: `in`? defined in `class`. +//value-parameter p: `in`? defined in `class`. //public final inner class `class` defined in `class` //public constructor `class`() defined in `class`.`class` //public val `is`: `class`<`interface`>.`class` defined in root package //public val `in`: `class`<`interface`> defined in root package //public fun <`in` : `interface`> `interface`.`fun`(`false`: `interface`): `interface` where `in` : kotlin.Number defined in root package //<`in` : `interface` & kotlin.Number> defined in `fun` -//value-parameter val `false`: `interface` defined in `fun` +//value-parameter `false`: `interface` defined in `fun` //public val AS_SAFE: kotlin.Int defined in root package //public val NOT_IN: kotlin.Int defined in root package //public val NOT_IS: kotlin.Int defined in root package diff --git a/compiler/testData/renderer/ObjectWithConstructor.kt b/compiler/testData/renderer/ObjectWithConstructor.kt index b32aaf29a34..c42770c2d1b 100644 --- a/compiler/testData/renderer/ObjectWithConstructor.kt +++ b/compiler/testData/renderer/ObjectWithConstructor.kt @@ -19,17 +19,17 @@ class A3 { //public object A1 defined in root package //private constructor A1() defined in A1 //private constructor A1(x: kotlin.Int = ..., y: kotlin.Int) defined in A1 -//value-parameter val x: kotlin.Int = ... defined in A1. -//value-parameter val y: kotlin.Int defined in A1. +//value-parameter x: kotlin.Int = ... defined in A1. +//value-parameter y: kotlin.Int defined in A1. //public object A2 defined in root package //public constructor A2(prop: kotlin.Int) defined in A2 -//value-parameter val prop: kotlin.Int defined in A2. +//value-parameter prop: kotlin.Int defined in A2. //private constructor A2(x: kotlin.Int = ..., y: kotlin.Int) defined in A2 -//value-parameter val x: kotlin.Int = ... defined in A2. -//value-parameter val y: kotlin.Int defined in A2. +//value-parameter x: kotlin.Int = ... defined in A2. +//value-parameter y: kotlin.Int defined in A2. //public final class A3 defined in root package //public constructor A3() defined in A3 //public companion object B defined in A3 //private constructor B(prop: kotlin.Int) defined in A3.B -//value-parameter val prop: kotlin.Int defined in A3.B. +//value-parameter prop: kotlin.Int defined in A3.B. //public constructor B() defined in A3.B diff --git a/compiler/testData/renderer/StarProjection.kt b/compiler/testData/renderer/StarProjection.kt index 1630df7cf63..94f9041b29a 100644 --- a/compiler/testData/renderer/StarProjection.kt +++ b/compiler/testData/renderer/StarProjection.kt @@ -12,8 +12,8 @@ fun foo1(c: C>) {} //public constructor C>() defined in rendererTest.C //> defined in rendererTest.C //public final fun foo(c: rendererTest.C<*>): kotlin.Unit defined in rendererTest.C -//value-parameter val c: rendererTest.C<*> defined in rendererTest.C.foo +//value-parameter c: rendererTest.C<*> defined in rendererTest.C.foo //public fun foo(c: rendererTest.C<*>): kotlin.Unit defined in rendererTest -//value-parameter val c: rendererTest.C<*> defined in rendererTest.foo +//value-parameter c: rendererTest.C<*> defined in rendererTest.foo //public fun foo1(c: rendererTest.C>): kotlin.Unit defined in rendererTest -//value-parameter val c: rendererTest.C> defined in rendererTest.foo1 \ No newline at end of file +//value-parameter c: rendererTest.C> defined in rendererTest.foo1 \ No newline at end of file diff --git a/compiler/testData/renderer/TraitWithConstructor.kt b/compiler/testData/renderer/TraitWithConstructor.kt index eb448fdb9c6..3dc53ca1548 100644 --- a/compiler/testData/renderer/TraitWithConstructor.kt +++ b/compiler/testData/renderer/TraitWithConstructor.kt @@ -13,11 +13,11 @@ interface A2 private constructor(private val prop: Int) { //public interface A1 defined in root package //public constructor A1() defined in A1 //public constructor A1(x: kotlin.Int = ..., y: kotlin.Int) defined in A1 -//value-parameter val x: kotlin.Int = ... defined in A1. -//value-parameter val y: kotlin.Int defined in A1. +//value-parameter x: kotlin.Int = ... defined in A1. +//value-parameter y: kotlin.Int defined in A1. //public interface A2 defined in root package //private constructor A2(prop: kotlin.Int) defined in A2 -//value-parameter val prop: kotlin.Int defined in A2. +//value-parameter prop: kotlin.Int defined in A2. //public constructor A2(x: kotlin.Int = ..., y: kotlin.Int) defined in A2 -//value-parameter val x: kotlin.Int = ... defined in A2. -//value-parameter val y: kotlin.Int defined in A2. +//value-parameter x: kotlin.Int = ... defined in A2. +//value-parameter y: kotlin.Int defined in A2. diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index 6a36e5375f0..612c206b63c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt @@ -739,7 +739,9 @@ internal class DescriptorRendererImpl( } private fun renderValVarPrefix(variable: VariableDescriptor, builder: StringBuilder) { - builder.append(renderKeyword(if (variable.isVar) "var" else "val")).append(" ") + if (variable !is ValueParameterDescriptor) { + builder.append(renderKeyword(if (variable.isVar) "var" else "val")).append(" ") + } } private fun renderVariable(variable: VariableDescriptor, includeName: Boolean, builder: StringBuilder, topLevel: Boolean) { diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt index c4f2812b9cf..5ee924368a8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt @@ -25,6 +25,7 @@ import com.intellij.psi.PsiManager import org.jetbrains.kotlin.asJava.KtLightElement import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject @@ -115,13 +116,20 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() { private fun renderKotlinDeclaration(declaration: KtDeclaration, quickNavigation: Boolean): String { val context = declaration.analyze(BodyResolveMode.PARTIAL) - val declarationDescriptor = context[BindingContext.DECLARATION_TO_DESCRIPTOR, declaration] + var declarationDescriptor = context[BindingContext.DECLARATION_TO_DESCRIPTOR, declaration] if (declarationDescriptor == null) { LOG.info("Failed to find descriptor for declaration " + declaration.getElementTextWithContext()) return "No documentation available" } + if (declarationDescriptor is ValueParameterDescriptor) { + val property = context[BindingContext.VALUE_PARAMETER_AS_PROPERTY, declarationDescriptor] + if (property != null) { + declarationDescriptor = property + } + } + var renderedDecl = DESCRIPTOR_RENDERER.render(declarationDescriptor) if (!quickNavigation) { renderedDecl = "

" + renderedDecl + "
" diff --git a/idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes1.txt b/idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes1.txt index c31091c5569..f0861ff109d 100644 --- a/idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes1.txt +++ b/idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes1.txt @@ -1,2 +1,2 @@ -More than one overridden descriptor declares a default value for 'value-parameter val x: kotlin.Int = ... defined in multipleDefaultsFromSupertypes.foo'. As the compiler can not make sure these values agree, this is not allowed. \ No newline at end of file +More than one overridden descriptor declares a default value for 'value-parameter x: kotlin.Int = ... defined in multipleDefaultsFromSupertypes.foo'. As the compiler can not make sure these values agree, this is not allowed. \ No newline at end of file diff --git a/idea/testData/editor/quickDoc/AtFunctionParameter.kt b/idea/testData/editor/quickDoc/AtFunctionParameter.kt index 6dc2f04f73a..ca67fda641b 100644 --- a/idea/testData/editor/quickDoc/AtFunctionParameter.kt +++ b/idea/testData/editor/quickDoc/AtFunctionParameter.kt @@ -1,3 +1,3 @@ fun some(f: (Int) -> String) : String? = null -//INFO: value-parameter val f: (Int) → String defined in some +//INFO: value-parameter f: (Int) → String defined in some diff --git a/idea/testData/editor/quickDoc/ConstructorVarParameter.kt b/idea/testData/editor/quickDoc/ConstructorVarParameter.kt new file mode 100644 index 00000000000..4b2fcf79fc4 --- /dev/null +++ b/idea/testData/editor/quickDoc/ConstructorVarParameter.kt @@ -0,0 +1,7 @@ +class C(var v: Int) { + fun foo() { + print(v) + } +} + +//INFO: public final var v: Int defined in C diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt index 966a81b26dc..aca33ad8a69 100644 --- a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt +++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME // SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test. +// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test. // PARAM_TYPES: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> fun test() { J.getMap().filter { it.key } diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after index 315b3905c1d..a87678ed491 100644 --- a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after @@ -1,6 +1,6 @@ // WITH_RUNTIME // SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test. +// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test. // PARAM_TYPES: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> fun test() { J.getMap().filter { b(it) } diff --git a/idea/testData/refactoring/extractFunction/basic/calleeExpression.kt b/idea/testData/refactoring/extractFunction/basic/calleeExpression.kt index c9b51d0d742..b8b1a1a7b62 100644 --- a/idea/testData/refactoring/extractFunction/basic/calleeExpression.kt +++ b/idea/testData/refactoring/extractFunction/basic/calleeExpression.kt @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val y: kotlin.String.() -> kotlin.Unit defined in foo +// PARAM_DESCRIPTOR: value-parameter y: kotlin.String.() -> kotlin.Unit defined in foo // PARAM_TYPES: kotlin.String.() -> kotlin.Unit fun foo(x : String, y : String.() -> Unit) { diff --git a/idea/testData/refactoring/extractFunction/basic/calleeExpression.kt.after b/idea/testData/refactoring/extractFunction/basic/calleeExpression.kt.after index c7d3d587662..1a4d720e61a 100644 --- a/idea/testData/refactoring/extractFunction/basic/calleeExpression.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/calleeExpression.kt.after @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val y: kotlin.String.() -> kotlin.Unit defined in foo +// PARAM_DESCRIPTOR: value-parameter y: kotlin.String.() -> kotlin.Unit defined in foo // PARAM_TYPES: kotlin.String.() -> kotlin.Unit fun foo(x : String, y : String.() -> Unit) { diff --git a/idea/testData/refactoring/extractFunction/basic/convertInfixExpression.kt b/idea/testData/refactoring/extractFunction/basic/convertInfixExpression.kt index 4a3f2bdfc0d..31ad42b97e8 100644 --- a/idea/testData/refactoring/extractFunction/basic/convertInfixExpression.kt +++ b/idea/testData/refactoring/extractFunction/basic/convertInfixExpression.kt @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val x: kotlin.String.(kotlin.String) -> kotlin.Unit defined in foo +// PARAM_DESCRIPTOR: value-parameter x: kotlin.String.(kotlin.String) -> kotlin.Unit defined in foo // PARAM_TYPES: kotlin.String.(kotlin.String) -> kotlin.Unit fun foo(x : String.(String) -> Unit) { diff --git a/idea/testData/refactoring/extractFunction/basic/convertInfixExpression.kt.after b/idea/testData/refactoring/extractFunction/basic/convertInfixExpression.kt.after index 9c532e2ee91..0725f0e80cd 100644 --- a/idea/testData/refactoring/extractFunction/basic/convertInfixExpression.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/convertInfixExpression.kt.after @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val x: kotlin.String.(kotlin.String) -> kotlin.Unit defined in foo +// PARAM_DESCRIPTOR: value-parameter x: kotlin.String.(kotlin.String) -> kotlin.Unit defined in foo // PARAM_TYPES: kotlin.String.(kotlin.String) -> kotlin.Unit fun foo(x : String.(String) -> Unit) { diff --git a/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt b/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt index eaed5243312..b88830f35d5 100644 --- a/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt +++ b/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val unaryPlus: kotlin.String.() -> kotlin.Unit defined in foo +// PARAM_DESCRIPTOR: value-parameter unaryPlus: kotlin.String.() -> kotlin.Unit defined in foo // PARAM_TYPES: kotlin.String.() -> kotlin.Unit fun foo(unaryPlus: String.() -> Unit) { diff --git a/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt.after b/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt.after index fa210685829..7d6471c3cb0 100644 --- a/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt.after @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val unaryPlus: kotlin.String.() -> kotlin.Unit defined in foo +// PARAM_DESCRIPTOR: value-parameter unaryPlus: kotlin.String.() -> kotlin.Unit defined in foo // PARAM_TYPES: kotlin.String.() -> kotlin.Unit fun foo(unaryPlus: String.() -> Unit) { diff --git a/idea/testData/refactoring/extractFunction/basic/extractToEnumClassBody.kt b/idea/testData/refactoring/extractFunction/basic/extractToEnumClassBody.kt index 0971360d4ae..4f84f365db5 100644 --- a/idea/testData/refactoring/extractFunction/basic/extractToEnumClassBody.kt +++ b/idea/testData/refactoring/extractFunction/basic/extractToEnumClassBody.kt @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in E.A.foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in E.A.foo // PARAM_TYPES: kotlin.Int enum class E { // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/basic/extractToEnumClassBody.kt.after b/idea/testData/refactoring/extractFunction/basic/extractToEnumClassBody.kt.after index 352f2bab93d..035a083c31f 100644 --- a/idea/testData/refactoring/extractFunction/basic/extractToEnumClassBody.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/extractToEnumClassBody.kt.after @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in E.A.foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in E.A.foo // PARAM_TYPES: kotlin.Int enum class E { // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt b/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt index e2b147cfee0..d0712005175 100644 --- a/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt +++ b/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 710699d08bb..86d401ae0f5 100644 --- a/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 a0fac1bd688..77a5b19834b 100644 --- a/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt +++ b/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 15e4e17c850..1734fb6faee 100644 --- a/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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/identityEquals.kt b/idea/testData/refactoring/extractFunction/basic/identityEquals.kt index 2cbef911397..63f8e166726 100644 --- a/idea/testData/refactoring/extractFunction/basic/identityEquals.kt +++ b/idea/testData/refactoring/extractFunction/basic/identityEquals.kt @@ -1,6 +1,6 @@ // SUGGESTED_NAMES: b, getT -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in test -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in test // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any diff --git a/idea/testData/refactoring/extractFunction/basic/identityEquals.kt.after b/idea/testData/refactoring/extractFunction/basic/identityEquals.kt.after index a284379faa1..8078f68364e 100644 --- a/idea/testData/refactoring/extractFunction/basic/identityEquals.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/identityEquals.kt.after @@ -1,6 +1,6 @@ // SUGGESTED_NAMES: b, getT -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in test -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in test // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any diff --git a/idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt.conflicts b/idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt.conflicts index ddf8bc12879..414720c6bb3 100644 --- a/idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt.conflicts +++ b/idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt.conflicts @@ -1 +1 @@ -Following declarations are used outside of selected code fragment: constructor A(n: Int = ...) value-parameter val n: Int = ... \ No newline at end of file +Following declarations are used outside of selected code fragment: constructor A(n: Int = ...) value-parameter n: Int = ... \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/basic/refInReturn.kt b/idea/testData/refactoring/extractFunction/basic/refInReturn.kt index 196584a9d01..fa568f178c4 100644 --- a/idea/testData/refactoring/extractFunction/basic/refInReturn.kt +++ b/idea/testData/refactoring/extractFunction/basic/refInReturn.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 4fbc30c093f..1b8de28e5f2 100644 --- a/idea/testData/refactoring/extractFunction/basic/refInReturn.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/refInReturn.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 c501de95c2b..e7dcb0390a3 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after index 342219bdf32..33278309720 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt index 2ae36919ed7..ec09239aa24 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt.after index 35f1a7a4133..7ed5bc78288 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt index 5ffddbd88c5..9e5e7c69faa 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after index 79a783e9d2c..ad485df097c 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt index 77b562cc6de..35cc5c50947 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after index 1802510f3e2..d8939a6b7c1 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt index 3a1c155f753..cf2e043ee13 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after index 3820c5a7d2d..5ff4f48961b 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt index 56df09f7903..f3f021c7518 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after index e6397f40f33..a12f0385e8d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt index 8e8a25cb8b9..5879415af95 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after index 903208941cd..12c7afb7a1e 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt index 42fe30b83f1..2858333959a 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after index 5d50aba876e..147df799e96 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt index 142eb50970f..ce8bb190399 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after index 58051b9dc61..9462c47d9be 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt index 237d8d137cf..d4162564f78 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after index 6733aaf952a..ab32c143d69 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt index 327f3a92d23..b137ffd6b09 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // WITH_RUNTIME // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after index dbc8cc35cc8..a9fc4abc7f4 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // WITH_RUNTIME // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt index 573fbeeea92..d48590402ce 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // WITH_RUNTIME // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt.after index c25d97b76d5..3fba6bdb587 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // WITH_RUNTIME // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt index fae6d89d3b5..9fb7932e8ea 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 b6978c31d84..2168cc8a470 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 a78cb689013..b3372160ede 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo fun bar(a: Int): Int { println(a) diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after index 3a2afb37145..0b0b9c7b8b3 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo fun bar(a: Int): Int { println(a) diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt index a0f54149ebf..1dd8ac10160 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo fun bar(a: Int): Int { println(a) diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after index ddf1827b12b..b4b8254c9da 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo fun bar(a: Int): Int { println(a) diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt index 00220825047..f9933cf72c1 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo fun bar(a: Int): Int { println(a) diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after index daadc953502..2195568653f 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo fun bar(a: Int): Int { println(a) diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt index 5e0c7f65aa3..42546b5840c 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo fun bar(a: Int): Int { println(a) diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after index a1e9f3248de..f2c20bbc4a9 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo fun bar(a: Int): Int { println(a) diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt index 7f4b7bf9545..a6ebedbc68b 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after index 22c84263bc1..5754aa27f74 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt index 22aaf79b430..f0fa41c9510 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after index ee8ffdc3850..1122b2f9de3 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt index 392ec598aa8..bf7327e7191 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt @@ -1,5 +1,5 @@ // WITH_RUNTIME -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. +// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo. // PARAM_TYPES: kotlin.Int fun foo(a: Int): Int { a.let { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt.after index f83367f880f..38dcec62a52 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt.after @@ -1,5 +1,5 @@ // WITH_RUNTIME -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. +// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo. // PARAM_TYPES: kotlin.Int fun foo(a: Int): Int { a.let { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt index a8332ccddef..d5c07310ed2 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt @@ -1,5 +1,5 @@ // WITH_RUNTIME -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. +// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo. // PARAM_TYPES: kotlin.Int fun foo(a: Int): Int { a.let { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt.after index e1da24cb032..6a574cb7ef7 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt.after @@ -1,5 +1,5 @@ // WITH_RUNTIME -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. +// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo. // PARAM_TYPES: kotlin.Int fun foo(a: Int): Int { a.let { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt index bdfc32e331f..3d7a3319e99 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt @@ -1,5 +1,5 @@ // WITH_RUNTIME -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. +// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo. // PARAM_TYPES: kotlin.Int fun foo(): Int { 1.let { return it + 1 } diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt.after index 13da6510dbb..6145abeb123 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt.after @@ -1,5 +1,5 @@ // WITH_RUNTIME -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. +// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo. // PARAM_TYPES: kotlin.Int fun foo(): Int { 1.let { return i(it) } diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt index e4e99bb273b..a8f0354e55e 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt @@ -1,5 +1,5 @@ // WITH_RUNTIME -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. +// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo. // PARAM_TYPES: kotlin.Int fun foo(): Int { 1.let { return@foo it + 1 } diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt.after index 11f611e8200..6bdee1d901c 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt.after @@ -1,5 +1,5 @@ // WITH_RUNTIME -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. +// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo. // PARAM_TYPES: kotlin.Int fun foo(): Int { 1.let { return@foo i(it) } diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt index 692161f2e2e..9d277d5dc73 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after index 3a6d42641e6..3adfda65985 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt index e1e92e23b19..4e8e2a432fb 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after index 4e8fef11282..bc57ab7f0d8 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt index 7609ae420b1..9469fedd82e 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after index c77a1117104..4cf5e2337ca 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt index cc05e54fe86..31bbd4d7a0c 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after index 4b80bb742e5..8bdbd4bac5b 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt index bcc8275014a..4f0898fb6aa 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt @@ -1,6 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 3d1ea8fbd7b..807dac818d1 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 1c7d1726c5d..a2ea36caa7b 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after index 50496f1c0b1..612d65c9938 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt index f3c4709bf86..f2c1d9f5299 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after index 1c639b3c76c..dd8d090017b 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt index 549cfa82cfd..8e848d67620 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after index a32877feb70..8343c979325 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakAndReturn.kt b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakAndReturn.kt index db1acfa1b62..26b16a269d2 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakAndReturn.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakAndReturn.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakAndReturn.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakAndReturn.kt.after index 88a824237f8..e98460d75ba 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakAndReturn.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakAndReturn.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt index e014aa4394c..28fe8859fba 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt.after index e173b62a6af..7257cfd48f9 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndBreak.kt b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndBreak.kt index cd3772b65b6..69dd158d842 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndBreak.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndBreak.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndBreak.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndBreak.kt.after index c0f7d6a6c73..d0cc5b78bf9 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndBreak.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndBreak.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndContinue.kt b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndContinue.kt index 165a75896b1..e93b6017c96 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndContinue.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndContinue.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndContinue.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndContinue.kt.after index 6a399dd0635..18a18978fda 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndContinue.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndContinue.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturn.kt b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturn.kt index e6acca1d183..223c317eb02 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturn.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturn.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturn.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturn.kt.after index 84ce5827e8f..13d1b5d83e7 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturn.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturn.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt index 65ddd32a15f..00b71237831 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int, Comparable -// PARAM_DESCRIPTOR: value-parameter val i: kotlin.Int defined in example +// PARAM_DESCRIPTOR: value-parameter i: kotlin.Int defined in example fun example(i: Int) { when (i) { 1 -> { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt.after index 9e7a203693b..e9872077a66 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt.after @@ -1,6 +1,6 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int, Comparable -// PARAM_DESCRIPTOR: value-parameter val i: kotlin.Int defined in example +// PARAM_DESCRIPTOR: value-parameter i: kotlin.Int defined in example fun example(i: Int) { when (i) { 1 -> { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt index b5cd0559e41..8ea9fe5de79 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt @@ -3,7 +3,7 @@ // PARAM_TYPES: B, A // PARAM_TYPES: kotlin.Int // PARAM_DESCRIPTOR: var a: A? defined in foo -// PARAM_DESCRIPTOR: value-parameter val b: B defined in foo +// PARAM_DESCRIPTOR: value-parameter b: B defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: fun foo(b: B): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after index 78711621b2c..0f697b51de3 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after @@ -3,7 +3,7 @@ // PARAM_TYPES: B, A // PARAM_TYPES: kotlin.Int // PARAM_DESCRIPTOR: var a: A? defined in foo -// PARAM_DESCRIPTOR: value-parameter val b: B defined in foo +// PARAM_DESCRIPTOR: value-parameter b: B defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: fun foo(b: B): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/nestedNonInlinableCall.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/nestedNonInlinableCall.kt index d869fcee202..cc67499a01c 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/nestedNonInlinableCall.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/nestedNonInlinableCall.kt @@ -1,7 +1,7 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/nestedNonInlinableCall.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/nestedNonInlinableCall.kt.after index 57bf26f0fe5..04e15c3a62d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/nestedNonInlinableCall.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/nestedNonInlinableCall.kt.after @@ -1,7 +1,7 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithExpression.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithExpression.kt index 72926f99601..df696dd916b 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithExpression.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithExpression.kt @@ -2,7 +2,7 @@ // SUGGESTED_NAMES: pair, getT // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithExpression.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithExpression.kt.after index 5e3ad3d9ff9..71dfeb40dbd 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithExpression.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithExpression.kt.after @@ -2,7 +2,7 @@ // SUGGESTED_NAMES: pair, getT // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt index 1c0dab80484..9e6ed436501 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt @@ -1,7 +1,7 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt.after index 461cdca63eb..cd65851c00f 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt.after @@ -1,7 +1,7 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt index b060c44b4cc..d753acf684d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt @@ -2,7 +2,7 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt.after index ee0dbe9ac7c..886ce73e843 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt.after @@ -2,7 +2,7 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValuesWithExpression.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValuesWithExpression.kt index 107ea59a6c0..97babb1c127 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValuesWithExpression.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValuesWithExpression.kt @@ -3,7 +3,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValuesWithExpression.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValuesWithExpression.kt.after index ce00ee1b370..51b8a26f1e5 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValuesWithExpression.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValuesWithExpression.kt.after @@ -3,7 +3,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt index 3e5a2db94bb..cfcf0509684 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt @@ -2,7 +2,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt.after index e843cd9128b..a4727ff3f4d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt.after @@ -2,7 +2,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithIf.kt index 14cf0f4f683..725f3c02b64 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithIf.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithIf.kt @@ -2,7 +2,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithIf.kt.after index 4af0155fa8f..cd6e171c020 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithIf.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithIf.kt.after @@ -2,7 +2,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt index 5ca93f892ea..9e402ae1d0e 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt @@ -2,7 +2,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt.after index 443615a30ce..330581c73d9 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt.after @@ -2,7 +2,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt index 726909a3e3c..1b4eb4b3495 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt @@ -2,7 +2,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt.after index 44cbf5dbe31..a16a7f64988 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt.after @@ -2,7 +2,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt index b23b8196fe9..9ac3fcb84de 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after index f1d5bff6b2a..60bd400dc34 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt index 624fcb641b9..b6e36df7156 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int, Comparable // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after index 20dd13c56d4..77119c9956c 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int, Comparable // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt index 482047cb942..4139ca16b83 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after index 9f26159cdde..478e0deddbc 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt index e09d1debcb9..408e71a09c4 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int, Comparable // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after index f09e50c8a5d..22afdfc7999 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after @@ -1,6 +1,6 @@ // PARAM_TYPES: kotlin.Int, Comparable // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt index 7546bf110d5..2ae97c39039 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after index 7e735e7067e..2e48adfc37f 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValues.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValues.kt index f5e42a4823c..c2836d4c6d1 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValues.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValues.kt @@ -2,7 +2,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt index f71c6866b75..b11b3dbf331 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt @@ -5,7 +5,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var d: kotlin.Int defined in foo diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt.after index dc439af4b25..c7b8a5fc097 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt.after @@ -5,7 +5,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var d: kotlin.Int defined in foo diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt index a1b5ca2ea42..e7d807222c3 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt @@ -3,7 +3,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var d: kotlin.Int defined in foo diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt.after index d28f07a2ea7..6e748cda563 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt.after @@ -3,7 +3,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var d: kotlin.Int defined in foo diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt index e3a6a6143c7..656824af02a 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt @@ -2,7 +2,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt.after index 4f8cd8659bb..e7da61535bc 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt.after @@ -2,7 +2,7 @@ // 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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt b/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt index 2f6cc075ef3..e1c918fa7f4 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after index 652bcb0ab59..0b89a0f54c6 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt b/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt index f0f8f6fe7e3..f1d10be2dbb 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after index d2244a72a5d..4b339214812 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt b/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt index ffb9e3fd745..c5b66365986 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt @@ -1,7 +1,7 @@ // SUGGESTED_NAMES: i, getT // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after index bf1edca8c5d..94b4071bb73 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after @@ -1,7 +1,7 @@ // SUGGESTED_NAMES: i, getT // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt b/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt index f583e0ab567..83e80b43396 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after index 9873db4bc6f..3380115aeb3 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int) { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt b/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt index aee9beb9b8f..e0973a3ab29 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after index 53fb7d5cf09..bcf4deb3df9 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt.after @@ -1,6 +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 a: kotlin.Int defined in foo // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt b/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt index 2f987f6dc18..2fd5ba2bde6 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt +++ b/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter 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 c71ea9ac474..06029361e5e 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter 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 cd75d5d8721..591617d2d6c 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt +++ b/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 c8bc8f0eabf..5fddb05882a 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after +++ b/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 a12b1546448..45d3e879515 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt +++ b/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 5b8f65b757b..2ea8b7ce587 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 30e21f6df70..f90669002ea 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt +++ b/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 2513a365950..bfe4cb45fe8 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 5376cb95f3c..e6c4f0d8025 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt +++ b/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt @@ -1,7 +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. +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B. +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in B. interface 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 200d20644a0..f62a23d9f1c 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after +++ b/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after @@ -1,7 +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. +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B. +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in B. interface 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 b24cf8ee556..00016521088 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt +++ b/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: T -// PARAM_DESCRIPTOR: value-parameter val t: T defined in B. +// PARAM_DESCRIPTOR: value-parameter t: T defined in B. interface 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 c4047be9ddc..be4cdca68f5 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after +++ b/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: T -// PARAM_DESCRIPTOR: value-parameter val t: T defined in B. +// PARAM_DESCRIPTOR: value-parameter t: T defined in B. interface 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 642bf84da76..170f1ab3111 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt +++ b/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt @@ -1,7 +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. +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B. +// PARAM_DESCRIPTOR: value-parameter 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 dc352fc6967..be37f865b3b 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after +++ b/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after @@ -1,7 +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. +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B. +// PARAM_DESCRIPTOR: value-parameter 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/duplicates/branchingMatch1.kt b/idea/testData/refactoring/extractFunction/duplicates/branchingMatch1.kt index 9edd990a2e2..c76d4846874 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/branchingMatch1.kt +++ b/idea/testData/refactoring/extractFunction/duplicates/branchingMatch1.kt @@ -2,7 +2,7 @@ // SUGGESTED_NAMES: i, getT // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test // PARAM_DESCRIPTOR: var b: kotlin.Int defined in test // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/duplicates/branchingMatch1.kt.after b/idea/testData/refactoring/extractFunction/duplicates/branchingMatch1.kt.after index dff6bae9cfc..0c6d71004c0 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/branchingMatch1.kt.after +++ b/idea/testData/refactoring/extractFunction/duplicates/branchingMatch1.kt.after @@ -2,7 +2,7 @@ // SUGGESTED_NAMES: i, getT // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test // PARAM_DESCRIPTOR: var b: kotlin.Int defined in test // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/duplicates/branchingMatch2.kt b/idea/testData/refactoring/extractFunction/duplicates/branchingMatch2.kt index 69eda395179..5c7066e117b 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/branchingMatch2.kt +++ b/idea/testData/refactoring/extractFunction/duplicates/branchingMatch2.kt @@ -1,7 +1,7 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test // PARAM_DESCRIPTOR: var b: kotlin.Int defined in test // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/duplicates/branchingMatch2.kt.after b/idea/testData/refactoring/extractFunction/duplicates/branchingMatch2.kt.after index 5c6d4c457d0..b8e151fb25c 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/branchingMatch2.kt.after +++ b/idea/testData/refactoring/extractFunction/duplicates/branchingMatch2.kt.after @@ -1,7 +1,7 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test // PARAM_DESCRIPTOR: var b: kotlin.Int defined in test // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/duplicates/defaultCF.kt b/idea/testData/refactoring/extractFunction/duplicates/defaultCF.kt index 818d3297dcd..f6109ceb9d8 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/defaultCF.kt +++ b/idea/testData/refactoring/extractFunction/duplicates/defaultCF.kt @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int, b: Int) { diff --git a/idea/testData/refactoring/extractFunction/duplicates/defaultCF.kt.after b/idea/testData/refactoring/extractFunction/duplicates/defaultCF.kt.after index 8e2ba6097ac..d18e702d3dd 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/defaultCF.kt.after +++ b/idea/testData/refactoring/extractFunction/duplicates/defaultCF.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int, b: Int) { diff --git a/idea/testData/refactoring/extractFunction/duplicates/multipleOutputValuesMatching.kt b/idea/testData/refactoring/extractFunction/duplicates/multipleOutputValuesMatching.kt index ad84426faa6..6bf44acedaf 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/multipleOutputValuesMatching.kt +++ b/idea/testData/refactoring/extractFunction/duplicates/multipleOutputValuesMatching.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test // SIBLING: fun test(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/duplicates/multipleOutputValuesMatching.kt.after b/idea/testData/refactoring/extractFunction/duplicates/multipleOutputValuesMatching.kt.after index d0520978a07..5e4027c63a2 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/multipleOutputValuesMatching.kt.after +++ b/idea/testData/refactoring/extractFunction/duplicates/multipleOutputValuesMatching.kt.after @@ -1,6 +1,6 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test // SIBLING: fun test(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/duplicates/outputValueMatching.kt b/idea/testData/refactoring/extractFunction/duplicates/outputValueMatching.kt index 7965dbc61d1..5dce693dfa1 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/outputValueMatching.kt +++ b/idea/testData/refactoring/extractFunction/duplicates/outputValueMatching.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test // SIBLING: fun test(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/duplicates/outputValueMatching.kt.after b/idea/testData/refactoring/extractFunction/duplicates/outputValueMatching.kt.after index 15014e77d0d..f2552a3bf24 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/outputValueMatching.kt.after +++ b/idea/testData/refactoring/extractFunction/duplicates/outputValueMatching.kt.after @@ -1,6 +1,6 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in test +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test // SIBLING: fun test(a: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt b/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt index 67c9d7058a4..67025e2f940 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt +++ b/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int, b: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt.after b/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt.after index b92b91c484f..80419260357 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt.after +++ b/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in foo // SIBLING: fun foo(a: Int, b: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt index 6225d82b41e..0df716da134 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A. class A(val a: Int, b: Int) { init { 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 9450185c162..d1141250dbc 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A. class A(val a: Int, b: Int) { init { 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 6f5b4f2f0f4..4e57dc833e3 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A. class A(val a: Int, b: Int) { init { 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 c1226ae4b95..f14a8c1162e 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A. class A(val a: Int, b: Int) { init { 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 3e603d57d65..f835f25992d 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt @@ -1,4 +1,4 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter 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 ad92bebbf68..1c9ba9d450a 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter 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 51d6771e379..61cf20e11cf 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt @@ -1,4 +1,4 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter 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 06b623b5c02..cfeab42f9d4 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter 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 6162020b336..0b5efd2d2f1 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in bar.foo +// PARAM_DESCRIPTOR: value-parameter 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 4872cd85cd6..1465f2ff9c3 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in bar.foo +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in bar.foo fun bar(n: Int) { fun i(a: Int, b: Int) = a + b - n diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt b/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt index 45d7d640521..3381fe64611 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in bar.foo +// PARAM_DESCRIPTOR: value-parameter 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 70b32d99ff3..7a8d28599db 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in bar.foo +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in bar.foo fun bar(n: Int) { fun i(a: Int, b: Int) = a + b - n diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt index 34e024b1376..3bf4da35738 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 267cd960e55..98965feb7bb 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 377a8db0258..cb21f84d72b 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 f86a3e3b3e0..d01556ba04a 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 a81602b9b5d..8fee3f7fa76 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 65fdf41f7aa..5883aeb70dd 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 8c88ea48ea9..3ce0aef34d3 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 683d5cf92e3..13e758fe34d 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 e88b447b75e..d1e14361940 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt @@ -1,5 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 65e8e5f4716..b4854500f94 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in foo fun foo(a: Int, b: Int) = i(a, b) - 1 private fun i(a: Int, b: Int) = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt index 7c690498d51..1f6a8e0cccc 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt @@ -1,4 +1,4 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 6c288a5aaf3..461ee9086af 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 28c3412c7c8..6771ef3f009 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt @@ -1,4 +1,4 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 f4c6bdd7e09..f5068bb0b27 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 7a23ea7b423..f7670ec0de3 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt @@ -1,5 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 a8f1f14ef71..22cdf66c46b 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt.after @@ -1,7 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in foo fun foo(a: Int, b: Int) = { i(a, b) - 1 }.invoke() private fun i(a: Int, b: Int) = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt b/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt index 89190f5bfca..e191b7ec686 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt +++ b/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt @@ -1,7 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in bar -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in bar +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in bar +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in bar fun bar(a: Int, b: Int) { val foo = a + b - 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt.after index afe9c454150..b702199b15e 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt.after @@ -1,7 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in bar -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in bar +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in bar +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in bar fun bar(a: Int, b: Int) { val foo = i(a, b) - 1 } diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt b/idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt index 2613155daf0..ac561b56d01 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt @@ -1,7 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in bar -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in bar +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in bar +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in bar fun bar(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/localPropertyWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt.after index f9a7ab5cfa4..5a20729b79e 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt.after @@ -1,7 +1,7 @@ // PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in bar -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in bar +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in bar +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in bar fun bar(a: Int, b: Int) { val foo = { i(a, b) - 1 }.invoke() } diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt b/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt index 026b0883114..41ef4fc443f 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt +++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter 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 4205c3d2a86..5e52be4576b 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter 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 ac40df5f886..3cd6766bcd1 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt +++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter 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 39076c760ad..bb5736e3367 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in A. +// PARAM_DESCRIPTOR: value-parameter 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/multipleTypes.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt index 63cf0eb9d3b..1d3b83e1984 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.String -// PARAM_DESCRIPTOR: value-parameter val p: kotlin.Any defined in foo +// PARAM_DESCRIPTOR: value-parameter p: kotlin.Any defined in foo fun foo(p: Any) { if (p is String) { diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt.after index d41942269f0..5c395748e02 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.String -// PARAM_DESCRIPTOR: value-parameter val p: kotlin.Any defined in foo +// PARAM_DESCRIPTOR: value-parameter p: kotlin.Any defined in foo fun foo(p: Any) { if (p is String) { diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes2.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes2.kt index 32f8f6bfec3..461accdf4c3 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes2.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes2.kt @@ -1,6 +1,6 @@ // SUGGESTED_NAMES: i, getX // PARAM_TYPES: kotlin.Any -// PARAM_DESCRIPTOR: value-parameter val o: kotlin.Any defined in foo +// PARAM_DESCRIPTOR: value-parameter o: kotlin.Any defined in foo open class A { val a = 1 diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes2.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes2.kt.after index 346748b6642..cf9094e007f 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes2.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes2.kt.after @@ -1,6 +1,6 @@ // SUGGESTED_NAMES: i, getX // PARAM_TYPES: kotlin.Any -// PARAM_DESCRIPTOR: value-parameter val o: kotlin.Any defined in foo +// PARAM_DESCRIPTOR: value-parameter o: kotlin.Any defined in foo open class A { val a = 1 diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes3.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes3.kt index 8ba0249ffed..7fa58b6bab7 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes3.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes3.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: A -// PARAM_DESCRIPTOR: value-parameter val o: kotlin.Any defined in foo +// PARAM_DESCRIPTOR: value-parameter o: kotlin.Any defined in foo open class A { val a = 1 diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes3.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes3.kt.after index 38144bd9480..668d607ecf6 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes3.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes3.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: A -// PARAM_DESCRIPTOR: value-parameter val o: kotlin.Any defined in foo +// PARAM_DESCRIPTOR: value-parameter o: kotlin.Any defined in foo open class A { val a = 1 diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt index e667142210f..f0c8777e59b 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt @@ -1,7 +1,7 @@ // PARAM_TYPES: kotlin.String, Comparable, CharSequence, java.io.Serializable, 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 +// PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 69cbddd4a7a..37c468d341a 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after @@ -1,7 +1,7 @@ // PARAM_TYPES: kotlin.String, Comparable, CharSequence, java.io.Serializable, 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 +// PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 fe2bc4e304b..ce5a9dc2a33 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt @@ -1,7 +1,7 @@ // PARAM_TYPES: kotlin.String?, kotlin.Comparable?, kotlin.CharSequence?, java.io.Serializable?, 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 +// PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 c24909c3d85..aa674b5c368 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after @@ -1,7 +1,7 @@ // PARAM_TYPES: kotlin.String?, kotlin.Comparable?, kotlin.CharSequence?, java.io.Serializable?, 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 +// PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 13007831bde..4454e9c5d69 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt @@ -1,5 +1,5 @@ //PARAM_TYPES: C, AImpl, A -//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo +//PARAM_DESCRIPTOR: value-parameter c: C defined in foo interface 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 3fe150079d4..45f0a5579ee 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after @@ -1,5 +1,5 @@ //PARAM_TYPES: C, AImpl, A -//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo +//PARAM_DESCRIPTOR: value-parameter c: C defined in foo interface A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt index e6ec42e71e4..bd5a8134c27 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt @@ -1,5 +1,5 @@ //PARAM_TYPES: C, B -//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo +//PARAM_DESCRIPTOR: value-parameter c: C defined in foo interface 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 64186d39038..7520c570e55 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after @@ -1,5 +1,5 @@ //PARAM_TYPES: C, B -//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo +//PARAM_DESCRIPTOR: value-parameter c: C defined in foo interface A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt index f7c75d181cb..7c7508342fe 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt @@ -1,5 +1,5 @@ //PARAM_TYPES: C -//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo +//PARAM_DESCRIPTOR: value-parameter c: C defined in foo interface 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 17def8e8674..2e15d573cfe 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after @@ -1,5 +1,5 @@ //PARAM_TYPES: C -//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo +//PARAM_DESCRIPTOR: value-parameter c: C defined in foo interface A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt index cedc81fb9a3..c847d726209 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt @@ -1,5 +1,5 @@ //PARAM_TYPES: C -//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo +//PARAM_DESCRIPTOR: value-parameter c: C defined in foo interface 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 94dc975c12f..5f85f81c064 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after @@ -1,5 +1,5 @@ //PARAM_TYPES: C -//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo +//PARAM_DESCRIPTOR: value-parameter c: C defined in foo interface A { fun doA() } diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt index 0977b8f9e7f..178ab5d0879 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt @@ -1,6 +1,6 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): Int defined in foo.bar -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo // PARAM_TYPES: (kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after index f8f9bcb2cd3..177028b44d4 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after @@ -1,6 +1,6 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): Int defined in foo.bar -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo // PARAM_TYPES: (kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt index d97aaef704f..b2ce762b95c 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt @@ -1,6 +1,6 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after index d0a6c962962..0116afbdc5a 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after @@ -1,6 +1,6 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt index 9d33959ff15..180db97ffca 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt @@ -1,7 +1,7 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar1(m: kotlin.Int): Int defined in foo // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): Int defined in foo -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after index 6921b3a6f7e..04093fefb5f 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after @@ -1,7 +1,7 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar1(m: kotlin.Int): Int defined in foo // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): Int defined in foo -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt index 0a09f632da2..c7fc386170a 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt @@ -1,6 +1,6 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after index 61d6d8990ca..05a49e6f9ac 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after @@ -1,6 +1,6 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt index 6a56af9e1fe..ce61588db14 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt @@ -1,6 +1,6 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): Int defined in foo -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo // PARAM_TYPES: (kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after index 006f00bb726..df8c2666cb0 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after @@ -1,6 +1,6 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): Int defined in foo -// PARAM_DESCRIPTOR: value-parameter val n: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo // PARAM_TYPES: (kotlin.Int) -> Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/paramAsExplicitInvoke.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/paramAsExplicitInvoke.kt index 41d65b7a370..356ef2444ba 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/paramAsExplicitInvoke.kt +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/paramAsExplicitInvoke.kt @@ -1,5 +1,5 @@ -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo -// PARAM_DESCRIPTOR: value-parameter val invoke: kotlin.String.() -> kotlin.Unit defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.String defined in foo +// PARAM_DESCRIPTOR: value-parameter invoke: kotlin.String.() -> kotlin.Unit defined in foo // PARAM_TYPES: kotlin.String // PARAM_TYPES: kotlin.String.() -> kotlin.Unit diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/paramAsExplicitInvoke.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/paramAsExplicitInvoke.kt.after index 11f4bc1f673..4fa977354f5 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/paramAsExplicitInvoke.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/paramAsExplicitInvoke.kt.after @@ -1,5 +1,5 @@ -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo -// PARAM_DESCRIPTOR: value-parameter val invoke: kotlin.String.() -> kotlin.Unit defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.String defined in foo +// PARAM_DESCRIPTOR: value-parameter invoke: kotlin.String.() -> kotlin.Unit defined in foo // PARAM_TYPES: kotlin.String // PARAM_TYPES: kotlin.String.() -> kotlin.Unit diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/paramWithExtensionInvoke.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/paramWithExtensionInvoke.kt index 256258c0d9e..6e625aa4cd5 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/paramWithExtensionInvoke.kt +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/paramWithExtensionInvoke.kt @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.String defined in foo // PARAM_TYPES: kotlin.String fun String.invoke() { diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/paramWithExtensionInvoke.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/paramWithExtensionInvoke.kt.after index 731c0e05149..85438dfafe3 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/paramWithExtensionInvoke.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/paramWithExtensionInvoke.kt.after @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.String defined in foo // PARAM_TYPES: kotlin.String fun String.invoke() { diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt index a76341fed5e..efdeb02a1bd 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt @@ -1,5 +1,5 @@ // PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.String defined in foo // PARAM_TYPES: kotlin.String.() -> kotlin.Unit // PARAM_TYPES: kotlin.String diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt.after index ffe1fbf08ae..501087839c9 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt.after @@ -1,5 +1,5 @@ // PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.String defined in foo // PARAM_TYPES: kotlin.String.() -> kotlin.Unit // PARAM_TYPES: kotlin.String diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt index d1a2e728d59..fb32295c263 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt @@ -1,5 +1,5 @@ // PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.String defined in foo // PARAM_TYPES: kotlin.String.() -> kotlin.Unit // PARAM_TYPES: kotlin.String diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt.after index 72c3eb03777..f106167420d 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt.after @@ -1,5 +1,5 @@ // PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.String defined in foo // PARAM_TYPES: kotlin.String.() -> kotlin.Unit // PARAM_TYPES: kotlin.String diff --git a/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt b/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt index 2bc3ec8fbea..28e591ff072 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt +++ b/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo.. +// PARAM_DESCRIPTOR: value-parameter 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 50bfdecc7e8..9985b952778 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo.. +// PARAM_DESCRIPTOR: value-parameter 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 51340ac6a45..85c0d40dc2a 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt +++ b/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Array -// PARAM_DESCRIPTOR: value-parameter val t: kotlin.Array defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 fddd9bd25bc..3ef16ece1e8 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Array -// PARAM_DESCRIPTOR: value-parameter val t: kotlin.Array defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 33ffa9a4929..2fdf14c4eb9 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt +++ b/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Array -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Array defined in foo. +// PARAM_DESCRIPTOR: value-parameter 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 5f054e65f1d..b9659fe4b8d 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Array -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Array defined in foo. +// PARAM_DESCRIPTOR: value-parameter 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 cff501a1820..2820d00a5f6 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt +++ b/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. +// PARAM_DESCRIPTOR: value-parameter 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 27bd28e1a9b..21b2d570c5c 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo. +// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo. fun Array.check(f: (T) -> Boolean): Boolean = false // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/extensionLambdaAsParameter.kt b/idea/testData/refactoring/extractFunction/parameters/misc/extensionLambdaAsParameter.kt index d38a530b44e..693c9016cf7 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/extensionLambdaAsParameter.kt +++ b/idea/testData/refactoring/extractFunction/parameters/misc/extensionLambdaAsParameter.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.String.() -> T -// PARAM_DESCRIPTOR: value-parameter val f: kotlin.String.() -> T defined in test +// PARAM_DESCRIPTOR: value-parameter f: kotlin.String.() -> T defined in test fun test(f: String.() -> T): T { while (true) { val answer = "Hey!".f() diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/extensionLambdaAsParameter.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/extensionLambdaAsParameter.kt.after index 6d3bebfb81b..c43ab02d2e7 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/extensionLambdaAsParameter.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/extensionLambdaAsParameter.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.String.() -> T -// PARAM_DESCRIPTOR: value-parameter val f: kotlin.String.() -> T defined in test +// PARAM_DESCRIPTOR: value-parameter f: kotlin.String.() -> T defined in test fun test(f: String.() -> T): T { return t(f) } diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt b/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt index 9d4e240a48b..89c96f80a85 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt +++ b/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt @@ -1,9 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 8fdd698de4d..216a9e96d67 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after @@ -1,9 +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 +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter 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/reducedParameterList.kt b/idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt index 1c2b2579228..35cf7e16ad7 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt +++ b/idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // SIBLING: fun foo(a: Int, b: Int): Int { if (a > 0) return a + b diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt.after index f78c08d1a8a..06e271f4668 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: kotlin.Int -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // SIBLING: fun foo(a: Int, b: Int): Int { if (b(a)) return a + b diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt b/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt index b765abaf06d..007d32aad90 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt +++ b/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt @@ -2,10 +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: value-parameter 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 +// PARAM_DESCRIPTOR: value-parameter 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 ad5c515eb2b..775ae76238b 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after @@ -2,10 +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: value-parameter 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 +// PARAM_DESCRIPTOR: value-parameter x: kotlin.Int defined in foo // SIBLING: public class A() { fun bar(a: Int, b: Int): Int { diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt b/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt index 0dc08aed3df..536d1c91793 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt +++ b/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any fun foo(a: Int): String { val x = "abc$a" diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt.after b/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt.after index ace6940cd9d..c803eaa985c 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt.after +++ b/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt.after @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any fun foo(a: Int): String { val x = s(a) diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithBlockExpr.kt b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithBlockExpr.kt index e667409008d..e89d403c246 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithBlockExpr.kt +++ b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithBlockExpr.kt @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int fun foo(a: Int): String { val x = "-${a + 1}" diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithBlockExpr.kt.after b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithBlockExpr.kt.after index 9274f2094b3..2f887fae577 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithBlockExpr.kt.after +++ b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithBlockExpr.kt.after @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int fun foo(a: Int): String { val x = "-${i(a)}" diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt index 06e5a1a0a53..4bc2786f77b 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt +++ b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any fun foo(a: Int): String { val x = "-$a" diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt.after b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt.after index 775e377bba4..19003d2eb98 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt.after +++ b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt.after @@ -1,4 +1,4 @@ -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int, Number, Comparable, java.io.Serializable, Any fun foo(a: Int): String { val x = "-${i(a)}" diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithPrefix.kt b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithPrefix.kt index 465a830b084..7975004af3d 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithPrefix.kt +++ b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithPrefix.kt @@ -1,5 +1,5 @@ // SUGGESTED_NAMES: s, getX -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int fun foo(a: Int): String { val x = "+cd$a:${a + 1}efg" diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithPrefix.kt.after b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithPrefix.kt.after index 9e62e4e325e..ea13d0823c5 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithPrefix.kt.after +++ b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithPrefix.kt.after @@ -1,5 +1,5 @@ // SUGGESTED_NAMES: s, getX -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int fun foo(a: Int): String { val x = "+${s(a)}g" diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSubstring.kt b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSubstring.kt index 08af97badad..8bb3981adf7 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSubstring.kt +++ b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSubstring.kt @@ -1,5 +1,5 @@ // SUGGESTED_NAMES: s, getX -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int fun foo(a: Int): String { val x = "_c$a:${a + 1}d_" diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSubstring.kt.after b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSubstring.kt.after index 9235c793e1d..012aac095d8 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSubstring.kt.after +++ b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSubstring.kt.after @@ -1,5 +1,5 @@ // SUGGESTED_NAMES: s, getX -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int fun foo(a: Int): String { val x = "_${s(a)}_" diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSuffix.kt b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSuffix.kt index ee69551069f..d101ad69d3a 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSuffix.kt +++ b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSuffix.kt @@ -1,5 +1,5 @@ // SUGGESTED_NAMES: s, getX -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int fun foo(a: Int): String { val x = "_ab$a:${a + 1}cd__" diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSuffix.kt.after b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSuffix.kt.after index e526c3119d1..c335a6cda12 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSuffix.kt.after +++ b/idea/testData/refactoring/extractFunction/stringTemplates/multipleEntriesWithSuffix.kt.after @@ -1,5 +1,5 @@ // SUGGESTED_NAMES: s, getX -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int fun foo(a: Int): String { val x = "_${s(a)}__" diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/rawTemplateWithSubstring.kt b/idea/testData/refactoring/extractFunction/stringTemplates/rawTemplateWithSubstring.kt index b45dbc90cc2..c62ab32573e 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/rawTemplateWithSubstring.kt +++ b/idea/testData/refactoring/extractFunction/stringTemplates/rawTemplateWithSubstring.kt @@ -1,5 +1,5 @@ // SUGGESTED_NAMES: s, getX -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int fun foo(a: Int): String { val x = """_c$a diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/rawTemplateWithSubstring.kt.after b/idea/testData/refactoring/extractFunction/stringTemplates/rawTemplateWithSubstring.kt.after index dc6f0920546..df03ab4afb6 100644 --- a/idea/testData/refactoring/extractFunction/stringTemplates/rawTemplateWithSubstring.kt.after +++ b/idea/testData/refactoring/extractFunction/stringTemplates/rawTemplateWithSubstring.kt.after @@ -1,5 +1,5 @@ // SUGGESTED_NAMES: s, getX -// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo +// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo // PARAM_TYPES: kotlin.Int fun foo(a: Int): String { val x = """_${s(a)}_""" diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt index a96c4b37826..55b6f379f31 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: V -// PARAM_DESCRIPTOR: value-parameter val v: V defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 2780fbb593e..92c8d99e307 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: V -// PARAM_DESCRIPTOR: value-parameter val v: V defined in foo +// PARAM_DESCRIPTOR: value-parameter 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 9a65725f8be..33793ac2655 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: V -// PARAM_DESCRIPTOR: value-parameter val v: V defined in foo +// PARAM_DESCRIPTOR: value-parameter v: V defined in foo open class Data(val x: Int) interface DataEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after index 9cdd5ab9442..785bcd76a7a 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: V -// PARAM_DESCRIPTOR: value-parameter val v: V defined in foo +// PARAM_DESCRIPTOR: value-parameter v: V defined in foo open class Data(val x: Int) interface DataEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt index 239cb023180..ca6d9d751f6 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: Data -// PARAM_DESCRIPTOR: value-parameter val d: Data defined in A.foo +// PARAM_DESCRIPTOR: value-parameter 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 d3c2ffa1f61..dfdc30e26db 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: Data -// PARAM_DESCRIPTOR: value-parameter val d: Data defined in A.foo +// PARAM_DESCRIPTOR: value-parameter d: Data defined in A.foo class Data(val t: Int) // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt index 924999e8344..769a481b879 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt @@ -2,7 +2,7 @@ // PARAM_TYPES: Foo // PARAM_TYPES: kotlin.String // PARAM_DESCRIPTOR: internal final class Foo defined in root package -// PARAM_DESCRIPTOR: value-parameter val l: kotlin.String defined in Foo.test +// PARAM_DESCRIPTOR: value-parameter l: kotlin.String defined in Foo.test import java.util.* diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after index aae6940fe6c..4b9cc30a9bd 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after @@ -2,7 +2,7 @@ // PARAM_TYPES: Foo // PARAM_TYPES: kotlin.String // PARAM_DESCRIPTOR: internal final class Foo defined in root package -// PARAM_DESCRIPTOR: value-parameter val l: kotlin.String defined in Foo.test +// PARAM_DESCRIPTOR: value-parameter l: kotlin.String defined in Foo.test import java.util.* diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt index 65a26fa47c5..5ce54b816c7 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt @@ -1,5 +1,5 @@ // SUGGESTED_NAMES: i, getA -// PARAM_DESCRIPTOR: value-parameter val t: T defined in test +// PARAM_DESCRIPTOR: value-parameter t: T defined in test // PARAM_TYPES: T fun foo(u: U) = 1 diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt.after index 93891a3a836..24702acadaa 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt.after @@ -1,5 +1,5 @@ // SUGGESTED_NAMES: i, getA -// PARAM_DESCRIPTOR: value-parameter val t: T defined in test +// PARAM_DESCRIPTOR: value-parameter t: T defined in test // PARAM_TYPES: T fun foo(u: U) = 1 diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt index f6a780d058e..a0342c44bcc 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt @@ -1,6 +1,6 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.String -// PARAM_DESCRIPTOR: value-parameter val l: kotlin.String defined in Foo.test +// PARAM_DESCRIPTOR: value-parameter l: kotlin.String defined in Foo.test import java.util.* diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt.after index 34e112a81e3..4d51148f071 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt.after @@ -1,6 +1,6 @@ // WITH_RUNTIME // PARAM_TYPES: kotlin.String -// PARAM_DESCRIPTOR: value-parameter val l: kotlin.String defined in Foo.test +// PARAM_DESCRIPTOR: value-parameter l: kotlin.String defined in Foo.test import java.util.* diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt index 36534f1bdff..0ee39ddb52a 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt @@ -3,7 +3,7 @@ // PARAM_TYPES: V, Data // PARAM_DESCRIPTOR: public final class A where T : DataEx defined in root package // PARAM_DESCRIPTOR: public final inner class B where U : DataExEx defined in A -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter v: V defined in A.B.foo open class Data(val x: Int) interface DataEx interface DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after index 044316a5260..fd698087bf8 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after @@ -3,7 +3,7 @@ // PARAM_TYPES: V, Data // PARAM_DESCRIPTOR: public final class A where T : DataEx defined in root package // PARAM_DESCRIPTOR: public final inner class B where U : DataExEx defined in A -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter v: V defined in A.B.foo open class Data(val x: Int) interface DataEx interface DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt index 50c3aa2a5f8..9e718fb389c 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt @@ -1,7 +1,7 @@ // PARAM_TYPES: A.B // PARAM_TYPES: V, Data // PARAM_DESCRIPTOR: public final inner class B where U : DataExEx defined in A -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter v: V defined in A.B.foo open class Data(val x: Int) interface DataEx interface DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after index 3cdd61e08d2..1a807dbe4fe 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after @@ -1,7 +1,7 @@ // PARAM_TYPES: A.B // PARAM_TYPES: V, Data // PARAM_DESCRIPTOR: public final inner class B where U : DataExEx defined in A -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter v: V defined in A.B.foo open class Data(val x: Int) interface DataEx interface DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt index 8547fb407f8..ca6e2d2c112 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: V, Data -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter v: V defined in A.B.foo open class Data(val x: Int) interface DataEx interface DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after index 5db708dbd77..c2dad5338b8 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: V, Data -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter v: V defined in A.B.foo open class Data(val x: Int) interface DataEx interface DataExEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt index 85f11eeaafe..c1e05e70142 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt @@ -3,7 +3,7 @@ // PARAM_TYPES: V, Data // PARAM_DESCRIPTOR: public final class A defined in root package // PARAM_DESCRIPTOR: public final inner class B defined in A -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter 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 fb2dd4e20a1..7a45457212a 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after @@ -3,7 +3,7 @@ // PARAM_TYPES: V, Data // PARAM_DESCRIPTOR: public final class A defined in root package // PARAM_DESCRIPTOR: public final inner class B defined in A -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter 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 731462bf7e7..29b68488888 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt @@ -1,7 +1,7 @@ // PARAM_TYPES: A.B // PARAM_TYPES: V, Data // PARAM_DESCRIPTOR: public final inner class B defined in A -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter 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 c2f6bc9440f..a296ca33de2 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after @@ -1,7 +1,7 @@ // PARAM_TYPES: A.B // PARAM_TYPES: V, Data // PARAM_DESCRIPTOR: public final inner class B defined in A -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter 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 3dffc8297e1..9a30adc5b8e 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt @@ -1,5 +1,5 @@ // PARAM_TYPES: V, Data -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter 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 553eae05951..28991731880 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after @@ -1,5 +1,5 @@ // PARAM_TYPES: V, Data -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo +// PARAM_DESCRIPTOR: value-parameter 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 0553f79ed3c..3c90089d3a4 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt @@ -1,7 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: V, Data // PARAM_DESCRIPTOR: public final class A where T : DataEx defined in root package -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo +// PARAM_DESCRIPTOR: value-parameter v: V defined in A.foo open class Data(val x: Int) interface DataEx diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after index fcf88c261b1..2e5d6274a84 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after @@ -1,7 +1,7 @@ // PARAM_TYPES: A // PARAM_TYPES: V, Data // PARAM_DESCRIPTOR: public final class A where T : DataEx defined in root package -// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo +// PARAM_DESCRIPTOR: value-parameter v: V defined in A.foo open class Data(val x: Int) interface DataEx diff --git a/idea/testData/resolve/additionalLazyResolve/anonymousObjectInClassParameterInitializer.kt b/idea/testData/resolve/additionalLazyResolve/anonymousObjectInClassParameterInitializer.kt index b65a2e77cac..4c9cb25da9a 100644 --- a/idea/testData/resolve/additionalLazyResolve/anonymousObjectInClassParameterInitializer.kt +++ b/idea/testData/resolve/additionalLazyResolve/anonymousObjectInClassParameterInitializer.kt @@ -13,6 +13,6 @@ class MyClass( //public constructor A() defined in test.A //public final class MyClass defined in test //public constructor MyClass(a: test.A = ...) defined in test.MyClass -//value-parameter val a: test.A = ... defined in test.MyClass. +//value-parameter a: test.A = ... defined in test.MyClass. //local final class : test.A defined in test.MyClass. //public constructor () defined in test.MyClass.. \ No newline at end of file diff --git a/idea/testData/resolve/additionalLazyResolve/localClassInClosureInClassParameterInitializer.kt b/idea/testData/resolve/additionalLazyResolve/localClassInClosureInClassParameterInitializer.kt index 25bff0a367a..49ecad4cae2 100644 --- a/idea/testData/resolve/additionalLazyResolve/localClassInClosureInClassParameterInitializer.kt +++ b/idea/testData/resolve/additionalLazyResolve/localClassInClosureInClassParameterInitializer.kt @@ -17,6 +17,6 @@ class MyClass( //public constructor A() defined in test.A //public final class MyClass defined in test //public constructor MyClass(a: test.A = ...) defined in test.MyClass -//value-parameter val a: test.A = ... defined in test.MyClass. +//value-parameter a: test.A = ... defined in test.MyClass. //local final class B : test.A defined in test.MyClass.. //public constructor B() defined in test.MyClass...B \ No newline at end of file diff --git a/idea/testData/resolve/additionalLazyResolve/localObjectInClosureInClassParameterInitializer.kt b/idea/testData/resolve/additionalLazyResolve/localObjectInClosureInClassParameterInitializer.kt index f31313790bf..c2ff3f3335d 100644 --- a/idea/testData/resolve/additionalLazyResolve/localObjectInClosureInClassParameterInitializer.kt +++ b/idea/testData/resolve/additionalLazyResolve/localObjectInClosureInClassParameterInitializer.kt @@ -17,6 +17,6 @@ class MyClass( //public constructor A() defined in test.A //public final class MyClass defined in test //public constructor MyClass(a: test.A = ...) defined in test.MyClass -//value-parameter val a: test.A = ... defined in test.MyClass. +//value-parameter a: test.A = ... defined in test.MyClass. //local object O : test.A defined in test.MyClass.. //private constructor O() defined in test.MyClass...O \ No newline at end of file diff --git a/idea/testData/resolve/partialBodyResolve/AnonymousObjects.completion b/idea/testData/resolve/partialBodyResolve/AnonymousObjects.completion index 3a760160652..85a24716b71 100644 --- a/idea/testData/resolve/partialBodyResolve/AnonymousObjects.completion +++ b/idea/testData/resolve/partialBodyResolve/AnonymousObjects.completion @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? +Resolve target: value-parameter p: kotlin.String? ---------------------------------------------- open class C(p: Int) { open fun f(){} diff --git a/idea/testData/resolve/partialBodyResolve/AnonymousObjects.dump b/idea/testData/resolve/partialBodyResolve/AnonymousObjects.dump index a9bcfa7543a..5f31b8a11b4 100644 --- a/idea/testData/resolve/partialBodyResolve/AnonymousObjects.dump +++ b/idea/testData/resolve/partialBodyResolve/AnonymousObjects.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? +Resolve target: value-parameter p: kotlin.String? ---------------------------------------------- open class C(p: Int) { open fun f(){} diff --git a/idea/testData/resolve/partialBodyResolve/As.completion b/idea/testData/resolve/partialBodyResolve/As.completion index a08d2e9b728..2ab68ffaf19 100644 --- a/idea/testData/resolve/partialBodyResolve/As.completion +++ b/idea/testData/resolve/partialBodyResolve/As.completion @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.Any smart-cast to kotlin.String ---------------------------------------------- fun foo(p: Any, p1: Any?) { x(e.f as String) diff --git a/idea/testData/resolve/partialBodyResolve/As.dump b/idea/testData/resolve/partialBodyResolve/As.dump index 910d5e27d1a..ada5f96757a 100644 --- a/idea/testData/resolve/partialBodyResolve/As.dump +++ b/idea/testData/resolve/partialBodyResolve/As.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.Any smart-cast to kotlin.String ---------------------------------------------- fun foo(p: Any, p1: Any?) { /* STATEMENT DELETED: x(e.f as String) */ diff --git a/idea/testData/resolve/partialBodyResolve/BangBang.completion b/idea/testData/resolve/partialBodyResolve/BangBang.completion index ff3031ce2a8..d3f0eb9fcd6 100644 --- a/idea/testData/resolve/partialBodyResolve/BangBang.completion +++ b/idea/testData/resolve/partialBodyResolve/BangBang.completion @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.String? smart-cast to kotlin.String ---------------------------------------------- fun foo(p: String?, p1: Any?) { x(e.f!!) diff --git a/idea/testData/resolve/partialBodyResolve/BangBang.dump b/idea/testData/resolve/partialBodyResolve/BangBang.dump index 1b7374ea532..5223288f8d3 100644 --- a/idea/testData/resolve/partialBodyResolve/BangBang.dump +++ b/idea/testData/resolve/partialBodyResolve/BangBang.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.String? smart-cast to kotlin.String ---------------------------------------------- fun foo(p: String?, p1: Any?) { /* STATEMENT DELETED: x(e.f!!) */ diff --git a/idea/testData/resolve/partialBodyResolve/BangBangInIfCondition.dump b/idea/testData/resolve/partialBodyResolve/BangBangInIfCondition.dump index 0eda044b04d..1cc7c4184b4 100644 --- a/idea/testData/resolve/partialBodyResolve/BangBangInIfCondition.dump +++ b/idea/testData/resolve/partialBodyResolve/BangBangInIfCondition.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Boolean? smart-cast to kotlin.Boolean +Resolve target: value-parameter p: kotlin.Boolean? smart-cast to kotlin.Boolean ---------------------------------------------- fun foo(p: Boolean?, p1: Any?) { if (p!!) { diff --git a/idea/testData/resolve/partialBodyResolve/DoWhile.dump b/idea/testData/resolve/partialBodyResolve/DoWhile.dump index 0629321e3ef..3ab37deae29 100644 --- a/idea/testData/resolve/partialBodyResolve/DoWhile.dump +++ b/idea/testData/resolve/partialBodyResolve/DoWhile.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.Any +Resolve target: value-parameter p: kotlin.Any? smart-cast to kotlin.Any ---------------------------------------------- fun foo(p: Any?) { do { diff --git a/idea/testData/resolve/partialBodyResolve/Elvis.dump b/idea/testData/resolve/partialBodyResolve/Elvis.dump index f86eb8eb921..720170f2fa0 100644 --- a/idea/testData/resolve/partialBodyResolve/Elvis.dump +++ b/idea/testData/resolve/partialBodyResolve/Elvis.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p1: kotlin.Any? +Resolve target: value-parameter p1: kotlin.Any? ---------------------------------------------- fun foo(p1: Any?, p2: Any) { /* STATEMENT DELETED: print(p1 ?: p2) */ diff --git a/idea/testData/resolve/partialBodyResolve/ElvisReturn.dump b/idea/testData/resolve/partialBodyResolve/ElvisReturn.dump index 2599d0854a5..9d235dd6341 100644 --- a/idea/testData/resolve/partialBodyResolve/ElvisReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/ElvisReturn.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.Any +Resolve target: value-parameter p: kotlin.Any? smart-cast to kotlin.Any ---------------------------------------------- fun foo(p: Any?) { print(p ?: return) diff --git a/idea/testData/resolve/partialBodyResolve/For2.dump b/idea/testData/resolve/partialBodyResolve/For2.dump index 81f421996f0..699e31dcbb1 100644 --- a/idea/testData/resolve/partialBodyResolve/For2.dump +++ b/idea/testData/resolve/partialBodyResolve/For2.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.Any? smart-cast to kotlin.String ---------------------------------------------- fun x(s: String): Collection{} diff --git a/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts2.dump b/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts2.dump index f881c9c08ed..f654960da8c 100644 --- a/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts2.dump +++ b/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts2.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p1: kotlin.Any? smart-cast to kotlin.Any +Resolve target: value-parameter p1: kotlin.Any? smart-cast to kotlin.Any ---------------------------------------------- fun foo(p: Any?, p1: Any?, p2: Any?) { if (x()) { diff --git a/idea/testData/resolve/partialBodyResolve/IfBranchesSmartCast.dump b/idea/testData/resolve/partialBodyResolve/IfBranchesSmartCast.dump index 8033cbf26a0..bc5796561aa 100644 --- a/idea/testData/resolve/partialBodyResolve/IfBranchesSmartCast.dump +++ b/idea/testData/resolve/partialBodyResolve/IfBranchesSmartCast.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val o: kotlin.Any? smart-cast to kotlin.Any +Resolve target: value-parameter o: kotlin.Any? smart-cast to kotlin.Any ---------------------------------------------- fun foo(o: Any?, p: Int) { if (p > 0) { diff --git a/idea/testData/resolve/partialBodyResolve/IfCallWithConditionReturn.dump b/idea/testData/resolve/partialBodyResolve/IfCallWithConditionReturn.dump index 5a1c857d0f6..8ad6f8afb89 100644 --- a/idea/testData/resolve/partialBodyResolve/IfCallWithConditionReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/IfCallWithConditionReturn.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? +Resolve target: value-parameter p: kotlin.Any? ---------------------------------------------- fun foo(p: Any?) { /* STATEMENT DELETED: if (x(p == null)) { print("returned true") return } */ diff --git a/idea/testData/resolve/partialBodyResolve/IfEqAutoCast.dump b/idea/testData/resolve/partialBodyResolve/IfEqAutoCast.dump index 7327f2deb38..de119cdcfaf 100644 --- a/idea/testData/resolve/partialBodyResolve/IfEqAutoCast.dump +++ b/idea/testData/resolve/partialBodyResolve/IfEqAutoCast.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val o: kotlin.String? smart-cast to kotlin.String +Resolve target: value-parameter o: kotlin.String? smart-cast to kotlin.String ---------------------------------------------- fun foo(o: String?, o1: String) { if (o != o1) return diff --git a/idea/testData/resolve/partialBodyResolve/IfIsReturn.dump b/idea/testData/resolve/partialBodyResolve/IfIsReturn.dump index 994ea86108d..0248cbff027 100644 --- a/idea/testData/resolve/partialBodyResolve/IfIsReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/IfIsReturn.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? +Resolve target: value-parameter p: kotlin.Any? ---------------------------------------------- fun foo(p: Any?) { /* STATEMENT DELETED: if (p is String) return */ diff --git a/idea/testData/resolve/partialBodyResolve/IfNegatedNotNullReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNegatedNotNullReturn.dump index fc45fa6928d..e5b8919fcc4 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNegatedNotNullReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNegatedNotNullReturn.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.Any +Resolve target: value-parameter p: kotlin.Any? smart-cast to kotlin.Any ---------------------------------------------- fun foo(p: Any?) { if (!(p != null)) return diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsError.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsError.dump index 8972637fe16..51a53acbc62 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsError.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsError.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.Any smart-cast to kotlin.String ---------------------------------------------- fun foo(p: Any) { if (p !is String) { diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.dump index 89833056685..fc05730182d 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.Any smart-cast to kotlin.String ---------------------------------------------- fun foo(p: Any) { if (p !is String) { diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsErrorVariable.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsErrorVariable.dump index 40b94a3caa4..73454eb6e89 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsErrorVariable.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsErrorVariable.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any +Resolve target: value-parameter p: kotlin.Any ---------------------------------------------- val error = "error" fun foo(p: Any) { diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.dump index 6a079ce74c3..ce8842d4596 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.Any smart-cast to kotlin.String ---------------------------------------------- fun myError(): Nothing = throw Exception() diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsMyErrorWithAliasImport.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsMyErrorWithAliasImport.dump index 124b67a91e1..f095597ecae 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsMyErrorWithAliasImport.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsMyErrorWithAliasImport.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.Any smart-cast to kotlin.String ---------------------------------------------- import kotlin.Nothing as MyNothing diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.dump index e10bff0a448..2e71e2f324f 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.Any smart-cast to kotlin.String ---------------------------------------------- val prop: Nothing get() = throw Exception() diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump index 236ec22e061..8bcc0a33fb4 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.Any? smart-cast to kotlin.String ---------------------------------------------- fun foo(p: Any?) { if (p !is String) { diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.dump index b7687110f49..d528e7c7fd5 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.Any smart-cast to kotlin.String ---------------------------------------------- fun foo(p: Any) { if (p !is String) { diff --git a/idea/testData/resolve/partialBodyResolve/IfNotNullElseReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNotNullElseReturn.dump index eabce4a496f..a22cbc83940 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotNullElseReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotNullElseReturn.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.Any +Resolve target: value-parameter p: kotlin.Any? smart-cast to kotlin.Any ---------------------------------------------- fun foo(p: Any?) { if (p != null) { diff --git a/idea/testData/resolve/partialBodyResolve/IfNullAlwaysExits.dump b/idea/testData/resolve/partialBodyResolve/IfNullAlwaysExits.dump index ea1563a050b..fa84f7ef6d8 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNullAlwaysExits.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNullAlwaysExits.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.String? smart-cast to kotlin.String ---------------------------------------------- fun foo(p: String?, x: Boolean, y: Boolean, z: Boolean, t: Boolean) { if (p == null) { diff --git a/idea/testData/resolve/partialBodyResolve/IfNullAndNullReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNullAndNullReturn.dump index 98a1893de2a..35af8e4ec4f 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNullAndNullReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNullAndNullReturn.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p1: kotlin.Any? +Resolve target: value-parameter p1: kotlin.Any? ---------------------------------------------- fun foo(p1: Any?, p2: Any?) { /* STATEMENT DELETED: if (p1 == null && p2 == null) { print("2 null's") return } */ diff --git a/idea/testData/resolve/partialBodyResolve/IfNullElseReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNullElseReturn.dump index de8e3f0907b..d282724e9da 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNullElseReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNullElseReturn.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? +Resolve target: value-parameter p: kotlin.Any? ---------------------------------------------- fun foo(p: Any?) { /* STATEMENT DELETED: if (p == null) { print("null") } else { return } */ diff --git a/idea/testData/resolve/partialBodyResolve/IfNullOrNullReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNullOrNullReturn.dump index e30433d5836..81ead9e7db7 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNullOrNullReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNullOrNullReturn.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p1: kotlin.Any? smart-cast to kotlin.Any +Resolve target: value-parameter p1: kotlin.Any? smart-cast to kotlin.Any ---------------------------------------------- fun foo(p1: Any?, p2: Any?) { if (p1 == null || p2 == null) { diff --git a/idea/testData/resolve/partialBodyResolve/IfNullPrint.dump b/idea/testData/resolve/partialBodyResolve/IfNullPrint.dump index e7ea4ab480f..58573ef4751 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNullPrint.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNullPrint.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? +Resolve target: value-parameter p: kotlin.Any? ---------------------------------------------- fun foo(p: Any?) { /* STATEMENT DELETED: if (p == null) { print("null") } */ diff --git a/idea/testData/resolve/partialBodyResolve/IfNullReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNullReturn.dump index a29ad9933f3..5cbaaddffbe 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNullReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNullReturn.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.Any +Resolve target: value-parameter p: kotlin.Any? smart-cast to kotlin.Any ---------------------------------------------- fun foo(p: Any?) { if (p == null) { diff --git a/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump b/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump index d0a8adebbc2..fd683a28b6f 100644 --- a/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump +++ b/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val c: kotlin.collections.Collection +Resolve target: value-parameter c: kotlin.collections.Collection ---------------------------------------------- fun foo(c: Collection): Collection { return c.filter { diff --git a/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing1.dump b/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing1.dump index 36265829a14..c9151b9cff2 100644 --- a/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing1.dump +++ b/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing1.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.String? smart-cast to kotlin.String ---------------------------------------------- fun foo(p: String?) { val lambda = { () -> throw Exception() } diff --git a/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.dump b/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.dump index 4b5f3c3b41f..0b5cfc40d75 100644 --- a/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.dump +++ b/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.String? smart-cast to kotlin.String ---------------------------------------------- fun foo(p: String?, errorHandler: () -> Nothing) { if (p == null) { diff --git a/idea/testData/resolve/partialBodyResolve/LocalClass.completion b/idea/testData/resolve/partialBodyResolve/LocalClass.completion index 6e965e2a888..ea793bab250 100644 --- a/idea/testData/resolve/partialBodyResolve/LocalClass.completion +++ b/idea/testData/resolve/partialBodyResolve/LocalClass.completion @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? +Resolve target: value-parameter p: kotlin.String? ---------------------------------------------- fun foo(p: String?) { class LocalClass { diff --git a/idea/testData/resolve/partialBodyResolve/LocalClass.dump b/idea/testData/resolve/partialBodyResolve/LocalClass.dump index 95ddf3faffc..9d199444ff3 100644 --- a/idea/testData/resolve/partialBodyResolve/LocalClass.dump +++ b/idea/testData/resolve/partialBodyResolve/LocalClass.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? +Resolve target: value-parameter p: kotlin.String? ---------------------------------------------- fun foo(p: String?) { /* STATEMENT DELETED: class LocalClass { fun f(): String? { if (p == null) return null print(p.size) return "" } } */ diff --git a/idea/testData/resolve/partialBodyResolve/LocalFun.completion b/idea/testData/resolve/partialBodyResolve/LocalFun.completion index 7c3dc20d527..45cf5f1e863 100644 --- a/idea/testData/resolve/partialBodyResolve/LocalFun.completion +++ b/idea/testData/resolve/partialBodyResolve/LocalFun.completion @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? +Resolve target: value-parameter p: kotlin.String? ---------------------------------------------- fun foo(p: String?) { fun local(): String? { diff --git a/idea/testData/resolve/partialBodyResolve/LocalFun.dump b/idea/testData/resolve/partialBodyResolve/LocalFun.dump index 73f8cfd4990..b204611d381 100644 --- a/idea/testData/resolve/partialBodyResolve/LocalFun.dump +++ b/idea/testData/resolve/partialBodyResolve/LocalFun.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? +Resolve target: value-parameter p: kotlin.String? ---------------------------------------------- fun foo(p: String?) { /* STATEMENT DELETED: fun local(): String? { if (p == null) return null print(p.size) return "" } */ diff --git a/idea/testData/resolve/partialBodyResolve/LocalNothingFun.completion b/idea/testData/resolve/partialBodyResolve/LocalNothingFun.completion index 3c81731f088..63fd55bb2aa 100644 --- a/idea/testData/resolve/partialBodyResolve/LocalNothingFun.completion +++ b/idea/testData/resolve/partialBodyResolve/LocalNothingFun.completion @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.String? smart-cast to kotlin.String ---------------------------------------------- fun foo(p: String?, p1: Any?) { if (p1 == null) return diff --git a/idea/testData/resolve/partialBodyResolve/LocalNothingFun.dump b/idea/testData/resolve/partialBodyResolve/LocalNothingFun.dump index 8227a5d3622..8cb8747d639 100644 --- a/idea/testData/resolve/partialBodyResolve/LocalNothingFun.dump +++ b/idea/testData/resolve/partialBodyResolve/LocalNothingFun.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.String? smart-cast to kotlin.String ---------------------------------------------- fun foo(p: String?, p1: Any?) { /* STATEMENT DELETED: if (p1 == null) return */ diff --git a/idea/testData/resolve/partialBodyResolve/MutliDeclaration.dump b/idea/testData/resolve/partialBodyResolve/MutliDeclaration.dump index c280f229666..1003badcf8e 100644 --- a/idea/testData/resolve/partialBodyResolve/MutliDeclaration.dump +++ b/idea/testData/resolve/partialBodyResolve/MutliDeclaration.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val b: kotlin.String? +Resolve target: value-parameter b: kotlin.String? ---------------------------------------------- data class TestData(val first: Int, val second: String?) diff --git a/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump b/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump index c1bdf933fea..4077d53a38d 100644 --- a/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump +++ b/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.String? smart-cast to kotlin.String +Resolve target: value-parameter p: kotlin.String? smart-cast to kotlin.String ---------------------------------------------- fun foo(p: String?): () -> String { if (p == null) { diff --git a/idea/testData/resolve/partialBodyResolve/Simple.dump b/idea/testData/resolve/partialBodyResolve/Simple.dump index 9bfe2bdd1db..ce39bdf01b7 100644 --- a/idea/testData/resolve/partialBodyResolve/Simple.dump +++ b/idea/testData/resolve/partialBodyResolve/Simple.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Int +Resolve target: value-parameter p: kotlin.Int ---------------------------------------------- fun foo(p: Int) { /* STATEMENT DELETED: x() */ diff --git a/idea/testData/resolve/partialBodyResolve/SmartCastInTheSameStatement.dump b/idea/testData/resolve/partialBodyResolve/SmartCastInTheSameStatement.dump index 7ba97984ece..7c5bc8f0ca0 100644 --- a/idea/testData/resolve/partialBodyResolve/SmartCastInTheSameStatement.dump +++ b/idea/testData/resolve/partialBodyResolve/SmartCastInTheSameStatement.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val s: kotlin.String? +Resolve target: value-parameter s: kotlin.String? ---------------------------------------------- fun foo(s: String?, b1: Boolean, b2: Boolean) { x( diff --git a/idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired1.dump b/idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired1.dump index 27cc477451d..9096175756a 100644 --- a/idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired1.dump +++ b/idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired1.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val x: kotlin.Any? +Resolve target: value-parameter x: kotlin.Any? ---------------------------------------------- fun foo(x: Any?, p: Int) { if (p > 0) { diff --git a/idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired2.dump b/idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired2.dump index 79489705b90..efc0474fe38 100644 --- a/idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired2.dump +++ b/idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired2.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val x: kotlin.Any? +Resolve target: value-parameter x: kotlin.Any? ---------------------------------------------- fun foo(x: Any?) { if (x == null) { diff --git a/idea/testData/resolve/partialBodyResolve/While.dump b/idea/testData/resolve/partialBodyResolve/While.dump index 84a71a21a5d..eed8e2012b1 100644 --- a/idea/testData/resolve/partialBodyResolve/While.dump +++ b/idea/testData/resolve/partialBodyResolve/While.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.Any +Resolve target: value-parameter p: kotlin.Any? smart-cast to kotlin.Any ---------------------------------------------- fun x(s: Any): Boolean{} diff --git a/idea/testData/resolve/partialBodyResolve/WhileTrue.dump b/idea/testData/resolve/partialBodyResolve/WhileTrue.dump index 7ce933cb497..e1f8b78ed1e 100644 --- a/idea/testData/resolve/partialBodyResolve/WhileTrue.dump +++ b/idea/testData/resolve/partialBodyResolve/WhileTrue.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.Any +Resolve target: value-parameter p: kotlin.Any? smart-cast to kotlin.Any ---------------------------------------------- fun x(): Boolean{} diff --git a/idea/testData/resolve/partialBodyResolve/WhileTrueCondition.dump b/idea/testData/resolve/partialBodyResolve/WhileTrueCondition.dump index 7ef40663035..29e69d3329b 100644 --- a/idea/testData/resolve/partialBodyResolve/WhileTrueCondition.dump +++ b/idea/testData/resolve/partialBodyResolve/WhileTrueCondition.dump @@ -1,4 +1,4 @@ -Resolve target: value-parameter val p: kotlin.Any? +Resolve target: value-parameter p: kotlin.Any? ---------------------------------------------- // this test will fail if control flow analysis will start to produce smart-casts after "while(2 * 2 == 4)" diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java index e805e8d1c63..e3785a0f15c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java @@ -53,6 +53,12 @@ public class QuickDocProviderTestGenerated extends AbstractQuickDocProviderTest doTest(fileName); } + @TestMetadata("ConstructorVarParameter.kt") + public void testConstructorVarParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/ConstructorVarParameter.kt"); + doTest(fileName); + } + @TestMetadata("JavaClassUsedInKotlin.kt") public void testJavaClassUsedInKotlin() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt");