From 0e6babc96b447a9dc80a26f659071b8479fa1a26 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Wed, 20 May 2015 14:27:09 +0200 Subject: [PATCH] Converted IdeRenderers to kotlin --- .../HtmlTabledDescriptorRenderer.java | 16 +- .../kotlin/idea/highlighter/IdeRenderers.kt | 190 ++++++------------ .../kotlin/idea/highlighter/renderersUtil.kt | 31 ++- 3 files changed, 90 insertions(+), 147 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java index ebec50ef4ec..d9508f0ec45 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java @@ -34,8 +34,8 @@ import org.jetbrains.kotlin.types.JetType; import java.util.Iterator; import java.util.List; -import static org.jetbrains.kotlin.idea.highlighter.IdeRenderers.error; -import static org.jetbrains.kotlin.idea.highlighter.IdeRenderers.strong; +import static org.jetbrains.kotlin.idea.highlighter.renderersUtil.RenderersUtilPackage.renderError; +import static org.jetbrains.kotlin.idea.highlighter.renderersUtil.RenderersUtilPackage.renderStrong; import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION; import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_POSITION; @@ -60,10 +60,10 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { result.append(text); } else if (elementType == TextElementType.ERROR) { - result.append(error(text)); + result.append(renderError(text)); } else if (elementType == TextElementType.STRONG) { - result.append(strong(text)); + result.append(renderStrong(text)); } } @@ -131,7 +131,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { if (isErrorPosition.apply(RECEIVER_POSITION.position())) { error = true; } - receiver = "receiver: " + strong(getTypeRenderer().render(receiverType), error); + receiver = "receiver: " + renderStrong(getTypeRenderer().render(receiverType), error); } td(result, receiver); td(result, hasReceiver ? "arguments: " : ""); @@ -140,7 +140,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { return; } - td(result, strong("(")); + td(result, renderStrong("(")); int i = 0; for (Iterator iterator = argumentTypes.iterator(); iterator.hasNext(); ) { JetType argumentType = iterator.next(); @@ -150,10 +150,10 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { } String renderedArgument = getTypeRenderer().render(argumentType); - tdRight(result, strong(renderedArgument, error) + (iterator.hasNext() ? strong(",") : "")); + tdRight(result, renderStrong(renderedArgument, error) + (iterator.hasNext() ? renderStrong(",") : "")); i++; } - td(result, strong(")")); + td(result, renderStrong(")")); } public static HtmlTabledDescriptorRenderer create() { 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 4cc724b7fee..1f3ec8d7bf9 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 @@ -14,150 +14,84 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.highlighter; +package org.jetbrains.kotlin.idea.highlighter -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.kotlin.diagnostics.rendering.Renderers; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; -import org.jetbrains.kotlin.renderer.Renderer; -import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsData; -import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; -import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.diagnostics.rendering.Renderers +import org.jetbrains.kotlin.idea.highlighter.renderersUtil.renderResolvedCall +import org.jetbrains.kotlin.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.Renderer +import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsData +import org.jetbrains.kotlin.types.JetType -import java.util.Collection; - -import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.*; -import static org.jetbrains.kotlin.idea.highlighter.renderersUtil.RenderersUtilPackage.renderResolvedCall; - -public class IdeRenderers { - private static final String RED_TEMPLATE = "%s"; - private static final String STRONG_TEMPLATE = "%s"; - - @NotNull - public static String strong(Object o) { - return String.format(STRONG_TEMPLATE, o); +public object IdeRenderers { + public val HTML_AMBIGUOUS_CALLS: Renderer>> = Renderer { + calls: Collection> -> + StringBuilder { + for (call in calls) { + append("
  • ") + append(DescriptorRenderer.HTML.render(call.getResultingDescriptor())) + append("
    • ") + } + }.toString() } - @NotNull - public static String error(Object o) { - return String.format(RED_TEMPLATE, o); + public val HTML_RENDER_TYPE: Renderer = Renderer { + DescriptorRenderer.HTML.renderType(it) } - @NotNull - public static String strong(Object o, boolean error) { - return String.format(error ? RED_TEMPLATE : STRONG_TEMPLATE, o); + public val HTML_NONE_APPLICABLE_CALLS: Renderer>> = Renderer { + calls: Collection> -> + StringBuilder { + for (resolvedCall in calls) { + append("
  • ") + append(renderResolvedCall(resolvedCall)) + append("
    • ") + } + }.toString() } - public static final Renderer>> HTML_AMBIGUOUS_CALLS = - new Renderer>>() { - @NotNull - @Override - public String render(@NotNull Collection> calls) { - StringBuilder stringBuilder = new StringBuilder(""); - for (ResolvedCall call : calls) { - stringBuilder.append("
  • "); - stringBuilder.append(DescriptorRenderer.HTML.render(call.getResultingDescriptor())); - stringBuilder.append("
    • "); - } - return stringBuilder.toString(); - } - }; + public val HTML_TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER: Renderer = Renderer { + Renderers.renderConflictingSubstitutionsInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString() + } - public static final Renderer HTML_RENDER_TYPE = new Renderer() { - @NotNull - @Override - public String render(@NotNull JetType type) { - return DescriptorRenderer.HTML.renderType(type); - } - }; + public val HTML_TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH_RENDERER: Renderer = Renderer { + Renderers.renderTypeConstructorMismatchError(it, HtmlTabledDescriptorRenderer.create()).toString() + } - public static final Renderer>> HTML_NONE_APPLICABLE_CALLS = - new Renderer>>() { + public val HTML_TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER: Renderer = Renderer { + Renderers.renderNoInformationForParameterError(it, HtmlTabledDescriptorRenderer.create()).toString() + } - @NotNull - @Override - public String render(@NotNull Collection> calls) { - StringBuilder stringBuilder = new StringBuilder(""); - for (ResolvedCall resolvedCall : calls) { - stringBuilder.append("
  • "); - stringBuilder.append(renderResolvedCall(resolvedCall)); - stringBuilder.append("
    • "); - } - return stringBuilder.toString(); - } - }; + public val HTML_TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER: Renderer = Renderer { + Renderers.renderUpperBoundViolatedInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString() + } - public static final Renderer HTML_TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER = - new Renderer() { - @NotNull - @Override - public String render(@NotNull InferenceErrorData inferenceErrorData) { - return renderConflictingSubstitutionsInferenceError(inferenceErrorData, HtmlTabledDescriptorRenderer.create()).toString(); - } - }; + public val HTML_RENDER_RETURN_TYPE: Renderer = Renderer { + val returnType = it.getReturnType()!! + DescriptorRenderer.HTML.renderType(returnType) + } - public static final Renderer HTML_TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH_RENDERER = - new Renderer() { - @NotNull - @Override - public String render(@NotNull InferenceErrorData inferenceErrorData) { - return renderTypeConstructorMismatchError(inferenceErrorData, HtmlTabledDescriptorRenderer.create()).toString(); - } - }; - - public static final Renderer HTML_TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER = - new Renderer() { - @NotNull - @Override - public String render(@NotNull InferenceErrorData inferenceErrorData) { - return renderNoInformationForParameterError(inferenceErrorData, HtmlTabledDescriptorRenderer.create()).toString(); - } - }; - - public static final Renderer HTML_TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER = - new Renderer() { - @NotNull - @Override - public String render(@NotNull InferenceErrorData inferenceErrorData) { - return renderUpperBoundViolatedInferenceError(inferenceErrorData, HtmlTabledDescriptorRenderer.create()).toString(); - } - }; - - public static final Renderer HTML_RENDER_RETURN_TYPE = new Renderer() { - @NotNull - @Override - public String render(@NotNull CallableMemberDescriptor object) { - JetType returnType = object.getReturnType(); - assert returnType != null; - return DescriptorRenderer.HTML.renderType(returnType); - } - }; - - public static final Renderer HTML_CONFLICTING_JVM_DECLARATIONS_DATA = new Renderer() { - @NotNull - @Override - public String render(@NotNull ConflictingJvmDeclarationsData data) { - StringBuilder sb = new StringBuilder("
      "); - for (JvmDeclarationOrigin origin : data.getSignatureOrigins()) { - DeclarationDescriptor descriptor = origin.getDescriptor(); + public val HTML_CONFLICTING_JVM_DECLARATIONS_DATA: Renderer = Renderer { + data: ConflictingJvmDeclarationsData -> + val sb = StringBuilder { + append("
        ") + for (origin in data.signatureOrigins) { + val descriptor = origin.descriptor if (descriptor != null) { - sb.append("
      • ").append(DescriptorRenderer.HTML_COMPACT_WITH_MODIFIERS.render(descriptor)).append("
        • \n"); + append("
      • ") + append(DescriptorRenderer.HTML_COMPACT_WITH_MODIFIERS.render(descriptor)) + append("
        • \n") } } - sb.append("
      "); - return ("The following declarations have the same JVM signature (" + data.getSignature().getName() + data.getSignature().getDesc() + "):
      \n" + sb).trim(); + append("
    ") } - }; + ("The following declarations have the same JVM signature (" + data.signature.name + data.signature.desc + "):
    \n" + sb).trim() + } - public static final Renderer HTML_THROWABLE = new Renderer() { - @NotNull - @Override - public String render(@NotNull Throwable e) { - return Renderers.THROWABLE.render(e).replace("\n", "
    "); - } - }; + public val HTML_THROWABLE: Renderer = Renderer { + Renderers.THROWABLE.render(it).replace("\n", "
    ") + } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt index 27ea467617c..c61419240c6 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt @@ -16,16 +16,25 @@ package org.jetbrains.kotlin.idea.highlighter.renderersUtil -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.kotlin.renderer.DescriptorRenderer -import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.kotlin.resolve.calls.callUtil.* -import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.idea.highlighter.IdeRenderers -import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.renderer.DescriptorRenderer +import org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.calls.callUtil.hasTypeMismatchErrorOnParameter +import org.jetbrains.kotlin.resolve.calls.callUtil.hasUnmappedArguments +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall +import org.jetbrains.kotlin.types.ErrorUtils + +private val RED_TEMPLATE = "%s" +private val STRONG_TEMPLATE = "%s" + +public fun renderStrong(o: Any): String = STRONG_TEMPLATE.format(o) + +public fun renderError(o: Any): String = RED_TEMPLATE.format(o) + +public fun renderStrong(o: Any, error: Boolean): String = (if (error) RED_TEMPLATE else STRONG_TEMPLATE).format(o) fun renderResolvedCall(resolvedCall: ResolvedCall): String { val htmlRenderer = DescriptorRenderer.HTML_FOR_UNINFERRED_TYPE_PARAMS @@ -42,7 +51,7 @@ fun renderResolvedCall(resolvedCall: ResolvedCall): htmlRenderer.renderType(parameterType) + if (parameter.hasDefaultValue()) " = ..." else "" if (resolvedCall.hasTypeMismatchErrorOnParameter(parameter)) { - return IdeRenderers.error(renderedParameter) + return renderError(renderedParameter) } return renderedParameter } @@ -60,7 +69,7 @@ fun renderResolvedCall(resolvedCall: ResolvedCall): append("
    $indentwhere ") if (!notInferredTypeParameters.isEmpty()) { - append(notInferredTypeParameters.map { typeParameter -> IdeRenderers.error(typeParameter.getName()) }.join()) + append(notInferredTypeParameters.map { typeParameter -> renderError(typeParameter.getName()) }.join()) append(" cannot be inferred") if (!inferredTypeParameters.isEmpty()) { append("; ") @@ -82,7 +91,7 @@ fun renderResolvedCall(resolvedCall: ResolvedCall): } append(resultingDescriptor.getName()).append("(") append(resultingDescriptor.getValueParameters().map { parameter -> renderParameter(parameter) }.join()) - append(if (resolvedCall.hasUnmappedArguments()) IdeRenderers.error(")") else ")") + append(if (resolvedCall.hasUnmappedArguments()) renderError(")") else ")") if (!resolvedCall.getCandidateDescriptor().getTypeParameters().isEmpty()) { appendTypeParametersSubstitution()