From 956b0aca923c3b9b67efdc7421fd7062fba133f6 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Fri, 15 Sep 2017 12:42:56 +0300 Subject: [PATCH] Rename header/impl in DescriptorRendererModifier --- .../src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt | 4 ++-- .../org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt index 7898e10362e..6f84ee01eb7 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt @@ -262,8 +262,8 @@ enum class DescriptorRendererModifier(val includeByDefault: Boolean) { INNER(true), MEMBER_KIND(true), DATA(true), - HEADER(true), - IMPL(true), + EXPECT(true), + ACTUAL(true), ; companion object { diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index 4124f01a6c6..88ed48a4c9c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt @@ -509,8 +509,8 @@ internal class DescriptorRendererImpl( private fun renderMemberModifiers(descriptor: MemberDescriptor, builder: StringBuilder) { renderModifier(builder, descriptor.isExternal, "external") - renderModifier(builder, DescriptorRendererModifier.HEADER in modifiers && descriptor.isExpect, "expect") - renderModifier(builder, DescriptorRendererModifier.IMPL in modifiers && descriptor.isActual, "actual") + renderModifier(builder, DescriptorRendererModifier.EXPECT in modifiers && descriptor.isExpect, "expect") + renderModifier(builder, DescriptorRendererModifier.ACTUAL in modifiers && descriptor.isActual, "actual") } private fun renderAdditionalModifiers(functionDescriptor: FunctionDescriptor, builder: StringBuilder) {