From aa77f6c245eba69defd27eb8be01f216caded3f7 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 16 Sep 2019 12:08:08 +0200 Subject: [PATCH] Improve KParameter.toString for instance and extension receiver parameter #KT-17860 Fixed --- .../box/reflection/methodsFromAny/parametersToString.kt | 4 ++-- .../kotlin/reflect/jvm/internal/ReflectionObjectRenderer.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/testData/codegen/box/reflection/methodsFromAny/parametersToString.kt b/compiler/testData/codegen/box/reflection/methodsFromAny/parametersToString.kt index 75154da7c21..f6ce7aa383c 100644 --- a/compiler/testData/codegen/box/reflection/methodsFromAny/parametersToString.kt +++ b/compiler/testData/codegen/box/reflection/methodsFromAny/parametersToString.kt @@ -16,12 +16,12 @@ fun baz(name: String) {} fun box(): String { assertEquals( - listOf("extension receiver of ${Int::foo}", "parameter #1 s of ${Int::foo}"), + listOf("extension receiver parameter of ${Int::foo}", "parameter #1 s of ${Int::foo}"), Int::foo.parameters.map(Any::toString) ) assertEquals( - listOf("instance of ${A::bar}"), + listOf("instance parameter of ${A::bar}"), A::bar.parameters.map(Any::toString) ) diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionObjectRenderer.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionObjectRenderer.kt index 7151726738c..d171c01f1b8 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionObjectRenderer.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionObjectRenderer.kt @@ -95,8 +95,8 @@ internal object ReflectionObjectRenderer { fun renderParameter(parameter: KParameterImpl): String { return buildString { when (parameter.kind) { - KParameter.Kind.EXTENSION_RECEIVER -> append("extension receiver") - KParameter.Kind.INSTANCE -> append("instance") + KParameter.Kind.EXTENSION_RECEIVER -> append("extension receiver parameter") + KParameter.Kind.INSTANCE -> append("instance parameter") KParameter.Kind.VALUE -> append("parameter #${parameter.index} ${parameter.name}") }