azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, rename renderer configuration parameter

Browse Source
This commit is contained in:
Alexander Udalov
2017-07-21 12:57:53 +03:00
parent e65a62c48c
commit f01e0ef335
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt
+2 -2
View File
@@ -194,7 +194,7 @@ interface DescriptorRendererOptions {
var unitReturnType: Boolean var unitReturnType: Boolean
var withoutReturnType: Boolean var withoutReturnType: Boolean
var normalizedVisibilities: Boolean var normalizedVisibilities: Boolean
var showInternalKeyword: Boolean var renderDefaultVisibility: Boolean
var uninferredTypeParameterAsName: Boolean var uninferredTypeParameterAsName: Boolean
var overrideRenderingPolicy: OverrideRenderingPolicy var overrideRenderingPolicy: OverrideRenderingPolicy
var valueParametersHandler: DescriptorRenderer.ValueParametersHandler var valueParametersHandler: DescriptorRenderer.ValueParametersHandler
@@ -233,7 +233,7 @@ object ExcludedTypeAnnotations {
enum class RenderingFormat { enum class RenderingFormat {
PLAIN { PLAIN {
override fun escape(string: String) = string; override fun escape(string: String) = string
}, },
HTML { HTML {
override fun escape(string: String) = string.replace("<", "&lt;").replace(">", "&gt;") override fun escape(string: String) = string.replace("<", "&lt;").replace(">", "&gt;")
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+1 -1
View File
@@ -458,7 +458,7 @@ internal class DescriptorRendererImpl(
if (normalizedVisibilities) { if (normalizedVisibilities) {
visibility = visibility.normalize() visibility = visibility.normalize()
} }
if (!showInternalKeyword && visibility == Visibilities.DEFAULT_VISIBILITY) return if (!renderDefaultVisibility && visibility == Visibilities.DEFAULT_VISIBILITY) return
builder.append(renderKeyword(visibility.displayName)).append(" ") builder.append(renderKeyword(visibility.displayName)).append(" ")
} }
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt
+1 -1
View File
@@ -77,7 +77,7 @@ internal class DescriptorRendererOptionsImpl : DescriptorRendererOptions {
override var unitReturnType by property(true) override var unitReturnType by property(true)
override var withoutReturnType by property(false) override var withoutReturnType by property(false)
override var normalizedVisibilities 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 uninferredTypeParameterAsName by property(false)
override var includePropertyConstant by property(false) override var includePropertyConstant by property(false)
override var withoutTypeParameters by property(false) override var withoutTypeParameters by property(false)
idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.kt
+1 -1
View File
@@ -44,7 +44,7 @@ object IdeDescriptorRenderers {
private val BASE: DescriptorRenderer = DescriptorRenderer.withOptions { private val BASE: DescriptorRenderer = DescriptorRenderer.withOptions {
normalizedVisibilities = true normalizedVisibilities = true
withDefinedIn = false withDefinedIn = false
showInternalKeyword = false renderDefaultVisibility = false
overrideRenderingPolicy = OverrideRenderingPolicy.RENDER_OVERRIDE overrideRenderingPolicy = OverrideRenderingPolicy.RENDER_OVERRIDE
unitReturnType = false unitReturnType = false
modifiers = DescriptorRendererModifier.ALL modifiers = DescriptorRendererModifier.ALL