From 8bfd30fc69d9c4242578e266ef818e67662862ae Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Wed, 21 Aug 2019 18:27:44 +0300 Subject: [PATCH] Minor: reformat IdeRenderers.kt --- .../kotlin/idea/highlighter/IdeRenderers.kt | 50 +++++++++++-------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt index edb2b704e92..4d8d7112cfe 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt @@ -27,63 +27,69 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsDa object IdeRenderers { - @JvmField val HTML_AMBIGUOUS_CALLS = Renderer { - calls: Collection> -> + @JvmField + val HTML_AMBIGUOUS_CALLS = Renderer { calls: Collection> -> val descriptors = calls - .map { it.resultingDescriptor } - .sortedWith(MemberComparator.INSTANCE) + .map { it.resultingDescriptor } + .sortedWith(MemberComparator.INSTANCE) val context = RenderingContext.Impl(descriptors) descriptors.joinToString("") { "
  • ${HTML.render(it, context)}
  • " } } - @JvmField val HTML_RENDER_TYPE = SmartTypeRenderer(DescriptorRenderer.HTML.withOptions { parameterNamesInFunctionalTypes = false }) + @JvmField + val HTML_RENDER_TYPE = SmartTypeRenderer(DescriptorRenderer.HTML.withOptions { parameterNamesInFunctionalTypes = false }) - @JvmField val HTML_NONE_APPLICABLE_CALLS = Renderer { - calls: Collection> -> + @JvmField + val HTML_NONE_APPLICABLE_CALLS = Renderer { calls: Collection> -> val context = RenderingContext.Impl(calls.map { it.resultingDescriptor }) val comparator = compareBy(MemberComparator.INSTANCE) { c: ResolvedCall<*> -> c.resultingDescriptor } calls - .sortedWith(comparator) - .joinToString("") { "
  • ${renderResolvedCall(it, context)}
  • " } + .sortedWith(comparator) + .joinToString("") { "
  • ${renderResolvedCall(it, context)}
  • " } } - @JvmField val HTML_TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER = Renderer { + @JvmField + val HTML_TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER = Renderer { Renderers.renderConflictingSubstitutionsInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString() } - @JvmField val HTML_TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR_RENDERER = Renderer { + @JvmField + val HTML_TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR_RENDERER = Renderer { Renderers.renderParameterConstraintError(it, HtmlTabledDescriptorRenderer.create()).toString() } - @JvmField val HTML_TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER = Renderer { + @JvmField + val HTML_TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER = Renderer { Renderers.renderNoInformationForParameterError(it, HtmlTabledDescriptorRenderer.create()).toString() } - @JvmField val HTML_TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER = Renderer { + @JvmField + val HTML_TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER = Renderer { Renderers.renderUpperBoundViolatedInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString() } - @JvmField val HTML_RENDER_RETURN_TYPE = ContextDependentRenderer { - member, context -> + @JvmField + val HTML_RENDER_RETURN_TYPE = ContextDependentRenderer { member, context -> HTML_RENDER_TYPE.render(member.returnType!!, context) } - @JvmField val HTML_CONFLICTING_JVM_DECLARATIONS_DATA = Renderer { - data: ConflictingJvmDeclarationsData -> + @JvmField + val HTML_CONFLICTING_JVM_DECLARATIONS_DATA = Renderer { data: ConflictingJvmDeclarationsData -> val descriptors = data.signatureOrigins - .mapNotNull { it.descriptor } - .sortedWith(MemberComparator.INSTANCE) + .mapNotNull { it.descriptor } + .sortedWith(MemberComparator.INSTANCE) val context = RenderingContext.of(descriptors) val conflicts = descriptors.joinToString("") { "
  • " + HTML.render(it, context) + "
  • \n" } "The following declarations have the same JVM signature (${data.signature.name}${data.signature.desc}):
    \n
      \n$conflicts
    " } - @JvmField val HTML_THROWABLE = ContextDependentRenderer { - throwable, context -> + @JvmField + val HTML_THROWABLE = ContextDependentRenderer { throwable, context -> Renderers.THROWABLE.render(throwable, context).replace("\n", "
    ") } - @JvmField val HTML = DescriptorRenderer.HTML.asRenderer() + @JvmField + val HTML = DescriptorRenderer.HTML.asRenderer() }