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

Minor: reformat IdeRenderers.kt

Browse Source
This commit is contained in:
Dmitry Savvinov
2019-08-21 18:27:44 +03:00
parent 249e5da53b
commit 8bfd30fc69
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt
+28 -22
View File
@@ -27,63 +27,69 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsDa
object IdeRenderers { object IdeRenderers {
@JvmField val HTML_AMBIGUOUS_CALLS = Renderer { @JvmField
calls: Collection<ResolvedCall<*>> -> val HTML_AMBIGUOUS_CALLS = Renderer { calls: Collection<ResolvedCall<*>> ->
val descriptors = calls val descriptors = calls
.map { it.resultingDescriptor } .map { it.resultingDescriptor }
.sortedWith(MemberComparator.INSTANCE) .sortedWith(MemberComparator.INSTANCE)
val context = RenderingContext.Impl(descriptors) val context = RenderingContext.Impl(descriptors)
descriptors.joinToString("") { "<li>${HTML.render(it, context)}</li>" } descriptors.joinToString("") { "<li>${HTML.render(it, context)}</li>" }
} }
@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 { @JvmField
calls: Collection<ResolvedCall<*>> -> val HTML_NONE_APPLICABLE_CALLS = Renderer { calls: Collection<ResolvedCall<*>> ->
val context = RenderingContext.Impl(calls.map { it.resultingDescriptor }) val context = RenderingContext.Impl(calls.map { it.resultingDescriptor })
val comparator = compareBy(MemberComparator.INSTANCE) { c: ResolvedCall<*> -> c.resultingDescriptor } val comparator = compareBy(MemberComparator.INSTANCE) { c: ResolvedCall<*> -> c.resultingDescriptor }
calls calls
.sortedWith(comparator) .sortedWith(comparator)
.joinToString("") { "<li>${renderResolvedCall(it, context)}</li>" } .joinToString("") { "<li>${renderResolvedCall(it, context)}</li>" }
} }
@JvmField val HTML_TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER = Renderer<InferenceErrorData> { @JvmField
val HTML_TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER = Renderer<InferenceErrorData> {
Renderers.renderConflictingSubstitutionsInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString() Renderers.renderConflictingSubstitutionsInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString()
} }
@JvmField val HTML_TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR_RENDERER = Renderer<InferenceErrorData> { @JvmField
val HTML_TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR_RENDERER = Renderer<InferenceErrorData> {
Renderers.renderParameterConstraintError(it, HtmlTabledDescriptorRenderer.create()).toString() Renderers.renderParameterConstraintError(it, HtmlTabledDescriptorRenderer.create()).toString()
} }
@JvmField val HTML_TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER = Renderer<InferenceErrorData> { @JvmField
val HTML_TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER = Renderer<InferenceErrorData> {
Renderers.renderNoInformationForParameterError(it, HtmlTabledDescriptorRenderer.create()).toString() Renderers.renderNoInformationForParameterError(it, HtmlTabledDescriptorRenderer.create()).toString()
} }
@JvmField val HTML_TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER = Renderer<InferenceErrorData> { @JvmField
val HTML_TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER = Renderer<InferenceErrorData> {
Renderers.renderUpperBoundViolatedInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString() Renderers.renderUpperBoundViolatedInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString()
} }
@JvmField val HTML_RENDER_RETURN_TYPE = ContextDependentRenderer<CallableMemberDescriptor> { @JvmField
member, context -> val HTML_RENDER_RETURN_TYPE = ContextDependentRenderer<CallableMemberDescriptor> { member, context ->
HTML_RENDER_TYPE.render(member.returnType!!, context) HTML_RENDER_TYPE.render(member.returnType!!, context)
} }
@JvmField val HTML_CONFLICTING_JVM_DECLARATIONS_DATA = Renderer { @JvmField
data: ConflictingJvmDeclarationsData -> val HTML_CONFLICTING_JVM_DECLARATIONS_DATA = Renderer { data: ConflictingJvmDeclarationsData ->
val descriptors = data.signatureOrigins val descriptors = data.signatureOrigins
.mapNotNull { it.descriptor } .mapNotNull { it.descriptor }
.sortedWith(MemberComparator.INSTANCE) .sortedWith(MemberComparator.INSTANCE)
val context = RenderingContext.of(descriptors) val context = RenderingContext.of(descriptors)
val conflicts = descriptors.joinToString("") { "<li>" + HTML.render(it, context) + "</li>\n" } val conflicts = descriptors.joinToString("") { "<li>" + HTML.render(it, context) + "</li>\n" }
"The following declarations have the same JVM signature (<code>${data.signature.name}${data.signature.desc}</code>):<br/>\n<ul>\n$conflicts</ul>" "The following declarations have the same JVM signature (<code>${data.signature.name}${data.signature.desc}</code>):<br/>\n<ul>\n$conflicts</ul>"
} }
@JvmField val HTML_THROWABLE = ContextDependentRenderer<Throwable> { @JvmField
throwable, context -> val HTML_THROWABLE = ContextDependentRenderer<Throwable> { throwable, context ->
Renderers.THROWABLE.render(throwable, context).replace("\n", "<br/>") Renderers.THROWABLE.render(throwable, context).replace("\n", "<br/>")
} }
@JvmField val HTML = DescriptorRenderer.HTML.asRenderer() @JvmField
val HTML = DescriptorRenderer.HTML.asRenderer()
} }