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

KT-22815: Rename parameter to match semantics

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-07-16 20:05:47 +03:00
parent ad6eac6ec6
commit c2e27a3c46
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
+1 -1
View File
@@ -198,7 +198,7 @@ interface DescriptorRendererOptions {
val includeAnnotationArguments: Boolean get() = annotationArgumentsRenderingPolicy.includeAnnotationArguments val includeAnnotationArguments: Boolean get() = annotationArgumentsRenderingPolicy.includeAnnotationArguments
val includeEmptyAnnotationArguments: Boolean get() = annotationArgumentsRenderingPolicy.includeEmptyAnnotationArguments val includeEmptyAnnotationArguments: Boolean get() = annotationArgumentsRenderingPolicy.includeEmptyAnnotationArguments
var boldForNamesInHtml: Boolean var boldOnlyForNamesInHtml: Boolean
var includePropertyConstant: Boolean var includePropertyConstant: Boolean
var parameterNameRenderingPolicy: ParameterNameRenderingPolicy var parameterNameRenderingPolicy: ParameterNameRenderingPolicy
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+2 -2
View File
@@ -48,7 +48,7 @@ internal class DescriptorRendererImpl(
private fun renderKeyword(keyword: String): String { private fun renderKeyword(keyword: String): String {
when (textFormat) { when (textFormat) {
RenderingFormat.PLAIN -> return keyword RenderingFormat.PLAIN -> return keyword
RenderingFormat.HTML -> return if (boldForNamesInHtml) keyword else "<b>$keyword</b>" RenderingFormat.HTML -> return if (boldOnlyForNamesInHtml) keyword else "<b>$keyword</b>"
} }
} }
@@ -81,7 +81,7 @@ internal class DescriptorRendererImpl(
/* NAMES RENDERING */ /* NAMES RENDERING */
override fun renderName(name: Name, rootRenderedElement: Boolean): String { override fun renderName(name: Name, rootRenderedElement: Boolean): String {
val escaped = escape(name.render()) val escaped = escape(name.render())
if (boldForNamesInHtml && textFormat == RenderingFormat.HTML && rootRenderedElement) { if (boldOnlyForNamesInHtml && textFormat == RenderingFormat.HTML && rootRenderedElement) {
return "<b>$escaped</b>" return "<b>$escaped</b>"
} }
return escaped return escaped
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt
+1 -1
View File
@@ -120,5 +120,5 @@ internal class DescriptorRendererOptionsImpl : DescriptorRendererOptions {
override var presentableUnresolvedTypes: Boolean by property(false) override var presentableUnresolvedTypes: Boolean by property(false)
override var boldForNamesInHtml: Boolean by property(false) override var boldOnlyForNamesInHtml: Boolean by property(false)
} }
idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
+1 -1
View File
@@ -171,7 +171,7 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() {
renderCompanionObjectName = true renderCompanionObjectName = true
withDefinedIn = false withDefinedIn = false
eachAnnotationOnNewLine = true eachAnnotationOnNewLine = true
boldForNamesInHtml = true boldOnlyForNamesInHtml = true
} }
private fun renderEnumSpecialFunction(element: KtClass, functionDescriptor: FunctionDescriptor, quickNavigation: Boolean): String { private fun renderEnumSpecialFunction(element: KtClass, functionDescriptor: FunctionDescriptor, quickNavigation: Boolean): String {