From f01e0ef3351cb7fc9beae29066b22958d5c23a6a Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 21 Jul 2017 12:57:53 +0300
Subject: [PATCH] Minor, rename renderer configuration parameter

---
 .../src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt   | 4 ++--
 .../org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt   | 2 +-
 .../kotlin/renderer/DescriptorRendererOptionsImpl.kt          | 2 +-
 .../org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.kt  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt
index 814ce794208..7898e10362e 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt
@@ -194,7 +194,7 @@ interface DescriptorRendererOptions {
     var unitReturnType: Boolean
     var withoutReturnType: Boolean
     var normalizedVisibilities: Boolean
-    var showInternalKeyword: Boolean
+    var renderDefaultVisibility: Boolean
     var uninferredTypeParameterAsName: Boolean
     var overrideRenderingPolicy: OverrideRenderingPolicy
     var valueParametersHandler: DescriptorRenderer.ValueParametersHandler
@@ -233,7 +233,7 @@ object ExcludedTypeAnnotations {
 
 enum class RenderingFormat {
     PLAIN {
-        override fun escape(string: String) = string;
+        override fun escape(string: String) = string
     },
     HTML {
         override fun escape(string: String) = string.replace("<", "&lt;").replace(">", "&gt;")
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
index 84f3725faaf..409a4f0679f 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
@@ -458,7 +458,7 @@ internal class DescriptorRendererImpl(
         if (normalizedVisibilities) {
             visibility = visibility.normalize()
         }
-        if (!showInternalKeyword && visibility == Visibilities.DEFAULT_VISIBILITY) return
+        if (!renderDefaultVisibility && visibility == Visibilities.DEFAULT_VISIBILITY) return
         builder.append(renderKeyword(visibility.displayName)).append(" ")
     }
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt
index c0337a70582..8315fa5d017 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt
@@ -77,7 +77,7 @@ internal class DescriptorRendererOptionsImpl : DescriptorRendererOptions {
     override var unitReturnType by property(true)
     override var withoutReturnType by property(false)
     override var normalizedVisibilities by property(false)
-    override var showInternalKeyword by property(true)
+    override var renderDefaultVisibility by property(true)
     override var uninferredTypeParameterAsName by property(false)
     override var includePropertyConstant by property(false)
     override var withoutTypeParameters by property(false)
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.kt
index ddeda1be9d0..a66bc198dd7 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.kt
@@ -44,7 +44,7 @@ object IdeDescriptorRenderers {
     private val BASE: DescriptorRenderer = DescriptorRenderer.withOptions {
         normalizedVisibilities = true
         withDefinedIn = false
-        showInternalKeyword = false
+        renderDefaultVisibility = false
         overrideRenderingPolicy = OverrideRenderingPolicy.RENDER_OVERRIDE
         unitReturnType = false
         modifiers = DescriptorRendererModifier.ALL