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

Converted IdeRenderers to kotlin

Browse Source
This commit is contained in:
Svetlana Isakova
2015-05-20 14:27:09 +02:00
parent 61df8c55e4
commit 0e6babc96b
3 changed files with 90 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java
+8 -8
View File
@@ -34,8 +34,8 @@ import org.jetbrains.kotlin.types.JetType;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import static org.jetbrains.kotlin.idea.highlighter.IdeRenderers.error; import static org.jetbrains.kotlin.idea.highlighter.renderersUtil.RenderersUtilPackage.renderError;
import static org.jetbrains.kotlin.idea.highlighter.IdeRenderers.strong; 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.RECEIVER_POSITION;
import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_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); result.append(text);
} }
else if (elementType == TextElementType.ERROR) { else if (elementType == TextElementType.ERROR) {
result.append(error(text)); result.append(renderError(text));
} }
else if (elementType == TextElementType.STRONG) { 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())) { if (isErrorPosition.apply(RECEIVER_POSITION.position())) {
error = true; error = true;
} }
receiver = "receiver: " + strong(getTypeRenderer().render(receiverType), error); receiver = "receiver: " + renderStrong(getTypeRenderer().render(receiverType), error);
} }
td(result, receiver); td(result, receiver);
td(result, hasReceiver ? "arguments: " : ""); td(result, hasReceiver ? "arguments: " : "");
@@ -140,7 +140,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer {
return; return;
} }
td(result, strong("(")); td(result, renderStrong("("));
int i = 0; int i = 0;
for (Iterator<JetType> iterator = argumentTypes.iterator(); iterator.hasNext(); ) { for (Iterator<JetType> iterator = argumentTypes.iterator(); iterator.hasNext(); ) {
JetType argumentType = iterator.next(); JetType argumentType = iterator.next();
@@ -150,10 +150,10 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer {
} }
String renderedArgument = getTypeRenderer().render(argumentType); String renderedArgument = getTypeRenderer().render(argumentType);
tdRight(result, strong(renderedArgument, error) + (iterator.hasNext() ? strong(",") : "")); tdRight(result, renderStrong(renderedArgument, error) + (iterator.hasNext() ? renderStrong(",") : ""));
i++; i++;
} }
td(result, strong(")")); td(result, renderStrong(")"));
} }
public static HtmlTabledDescriptorRenderer create() { public static HtmlTabledDescriptorRenderer create() {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt
+62 -128
View File
@@ -14,150 +14,84 @@
* limitations under the License. * 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.CallableMemberDescriptor; import org.jetbrains.kotlin.diagnostics.rendering.Renderers
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.idea.highlighter.renderersUtil.renderResolvedCall
import org.jetbrains.kotlin.diagnostics.rendering.Renderers; import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.Renderer
import org.jetbrains.kotlin.renderer.Renderer; import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData
import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsData
import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsData; import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
import org.jetbrains.kotlin.types.JetType;
import java.util.Collection; public object IdeRenderers {
public val HTML_AMBIGUOUS_CALLS: Renderer<Collection<ResolvedCall<*>>> = Renderer {
import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.*; calls: Collection<ResolvedCall<*>> ->
import static org.jetbrains.kotlin.idea.highlighter.renderersUtil.RenderersUtilPackage.renderResolvedCall; StringBuilder {
for (call in calls) {
public class IdeRenderers { append("<li>")
private static final String RED_TEMPLATE = "<font color=red><b>%s</b></font>"; append(DescriptorRenderer.HTML.render(call.getResultingDescriptor()))
private static final String STRONG_TEMPLATE = "<b>%s</b>"; append("</li>")
}
@NotNull }.toString()
public static String strong(Object o) {
return String.format(STRONG_TEMPLATE, o);
} }
@NotNull public val HTML_RENDER_TYPE: Renderer<JetType> = Renderer {
public static String error(Object o) { DescriptorRenderer.HTML.renderType(it)
return String.format(RED_TEMPLATE, o);
} }
@NotNull public val HTML_NONE_APPLICABLE_CALLS: Renderer<Collection<ResolvedCall<*>>> = Renderer {
public static String strong(Object o, boolean error) { calls: Collection<ResolvedCall<*>> ->
return String.format(error ? RED_TEMPLATE : STRONG_TEMPLATE, o); StringBuilder {
for (resolvedCall in calls) {
append("<li>")
append(renderResolvedCall(resolvedCall))
append("</li>")
}
}.toString()
} }
public static final Renderer<Collection<? extends ResolvedCall<?>>> HTML_AMBIGUOUS_CALLS = public val HTML_TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER: Renderer<InferenceErrorData> = Renderer {
new Renderer<Collection<? extends ResolvedCall<?>>>() { Renderers.renderConflictingSubstitutionsInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString()
@NotNull }
@Override
public String render(@NotNull Collection<? extends ResolvedCall<?>> calls) {
StringBuilder stringBuilder = new StringBuilder("");
for (ResolvedCall<?> call : calls) {
stringBuilder.append("<li>");
stringBuilder.append(DescriptorRenderer.HTML.render(call.getResultingDescriptor()));
stringBuilder.append("</li>");
}
return stringBuilder.toString();
}
};
public static final Renderer<JetType> HTML_RENDER_TYPE = new Renderer<JetType>() { public val HTML_TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH_RENDERER: Renderer<InferenceErrorData> = Renderer {
@NotNull Renderers.renderTypeConstructorMismatchError(it, HtmlTabledDescriptorRenderer.create()).toString()
@Override }
public String render(@NotNull JetType type) {
return DescriptorRenderer.HTML.renderType(type);
}
};
public static final Renderer<Collection<? extends ResolvedCall<?>>> HTML_NONE_APPLICABLE_CALLS = public val HTML_TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER: Renderer<InferenceErrorData> = Renderer {
new Renderer<Collection<? extends ResolvedCall<?>>>() { Renderers.renderNoInformationForParameterError(it, HtmlTabledDescriptorRenderer.create()).toString()
}
@NotNull public val HTML_TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER: Renderer<InferenceErrorData> = Renderer {
@Override Renderers.renderUpperBoundViolatedInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString()
public String render(@NotNull Collection<? extends ResolvedCall<?>> calls) { }
StringBuilder stringBuilder = new StringBuilder("");
for (ResolvedCall<?> resolvedCall : calls) {
stringBuilder.append("<li>");
stringBuilder.append(renderResolvedCall(resolvedCall));
stringBuilder.append("</li>");
}
return stringBuilder.toString();
}
};
public static final Renderer<InferenceErrorData> HTML_TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER = public val HTML_RENDER_RETURN_TYPE: Renderer<CallableMemberDescriptor> = Renderer {
new Renderer<InferenceErrorData>() { val returnType = it.getReturnType()!!
@NotNull DescriptorRenderer.HTML.renderType(returnType)
@Override }
public String render(@NotNull InferenceErrorData inferenceErrorData) {
return renderConflictingSubstitutionsInferenceError(inferenceErrorData, HtmlTabledDescriptorRenderer.create()).toString();
}
};
public static final Renderer<InferenceErrorData> HTML_TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH_RENDERER = public val HTML_CONFLICTING_JVM_DECLARATIONS_DATA: Renderer<ConflictingJvmDeclarationsData> = Renderer<ConflictingJvmDeclarationsData> {
new Renderer<InferenceErrorData>() { data: ConflictingJvmDeclarationsData ->
@NotNull val sb = StringBuilder {
@Override append("<ul>")
public String render(@NotNull InferenceErrorData inferenceErrorData) { for (origin in data.signatureOrigins) {
return renderTypeConstructorMismatchError(inferenceErrorData, HtmlTabledDescriptorRenderer.create()).toString(); val descriptor = origin.descriptor
}
};
public static final Renderer<InferenceErrorData> HTML_TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER =
new Renderer<InferenceErrorData>() {
@NotNull
@Override
public String render(@NotNull InferenceErrorData inferenceErrorData) {
return renderNoInformationForParameterError(inferenceErrorData, HtmlTabledDescriptorRenderer.create()).toString();
}
};
public static final Renderer<InferenceErrorData> HTML_TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER =
new Renderer<InferenceErrorData>() {
@NotNull
@Override
public String render(@NotNull InferenceErrorData inferenceErrorData) {
return renderUpperBoundViolatedInferenceError(inferenceErrorData, HtmlTabledDescriptorRenderer.create()).toString();
}
};
public static final Renderer<CallableMemberDescriptor> HTML_RENDER_RETURN_TYPE = new Renderer<CallableMemberDescriptor>() {
@NotNull
@Override
public String render(@NotNull CallableMemberDescriptor object) {
JetType returnType = object.getReturnType();
assert returnType != null;
return DescriptorRenderer.HTML.renderType(returnType);
}
};
public static final Renderer<ConflictingJvmDeclarationsData> HTML_CONFLICTING_JVM_DECLARATIONS_DATA = new Renderer<ConflictingJvmDeclarationsData>() {
@NotNull
@Override
public String render(@NotNull ConflictingJvmDeclarationsData data) {
StringBuilder sb = new StringBuilder("<ul>");
for (JvmDeclarationOrigin origin : data.getSignatureOrigins()) {
DeclarationDescriptor descriptor = origin.getDescriptor();
if (descriptor != null) { if (descriptor != null) {
sb.append("<li>").append(DescriptorRenderer.HTML_COMPACT_WITH_MODIFIERS.render(descriptor)).append("</li>\n"); append("<li>")
append(DescriptorRenderer.HTML_COMPACT_WITH_MODIFIERS.render(descriptor))
append("</li>\n")
} }
} }
sb.append("</ul>"); append("</ul>")
return ("The following declarations have the same JVM signature (<code>" + data.getSignature().getName() + data.getSignature().getDesc() + "</code>):<br/>\n" + sb).trim();
} }
}; ("The following declarations have the same JVM signature (<code>" + data.signature.name + data.signature.desc + "</code>):<br/>\n" + sb).trim()
}
public static final Renderer<Throwable> HTML_THROWABLE = new Renderer<Throwable>() { public val HTML_THROWABLE: Renderer<Throwable> = Renderer {
@NotNull Renderers.THROWABLE.render(it).replace("\n", "<br/>")
@Override }
public String render(@NotNull Throwable e) {
return Renderers.THROWABLE.render(e).replace("\n", "<br/>");
}
};
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt
+20 -11
View File
@@ -16,16 +16,25 @@
package org.jetbrains.kotlin.idea.highlighter.renderersUtil 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.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.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 = "<font color=red><b>%s</b></font>"
private val STRONG_TEMPLATE = "<b>%s</b>"
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 <D : CallableDescriptor> renderResolvedCall(resolvedCall: ResolvedCall<D>): String { fun <D : CallableDescriptor> renderResolvedCall(resolvedCall: ResolvedCall<D>): String {
val htmlRenderer = DescriptorRenderer.HTML_FOR_UNINFERRED_TYPE_PARAMS val htmlRenderer = DescriptorRenderer.HTML_FOR_UNINFERRED_TYPE_PARAMS
@@ -42,7 +51,7 @@ fun <D : CallableDescriptor> renderResolvedCall(resolvedCall: ResolvedCall<D>):
htmlRenderer.renderType(parameterType) + htmlRenderer.renderType(parameterType) +
if (parameter.hasDefaultValue()) " = ..." else "" if (parameter.hasDefaultValue()) " = ..." else ""
if (resolvedCall.hasTypeMismatchErrorOnParameter(parameter)) { if (resolvedCall.hasTypeMismatchErrorOnParameter(parameter)) {
return IdeRenderers.error(renderedParameter) return renderError(renderedParameter)
} }
return renderedParameter return renderedParameter
} }
@@ -60,7 +69,7 @@ fun <D : CallableDescriptor> renderResolvedCall(resolvedCall: ResolvedCall<D>):
append("<br/>$indent<i>where</i> ") append("<br/>$indent<i>where</i> ")
if (!notInferredTypeParameters.isEmpty()) { if (!notInferredTypeParameters.isEmpty()) {
append(notInferredTypeParameters.map { typeParameter -> IdeRenderers.error(typeParameter.getName()) }.join()) append(notInferredTypeParameters.map { typeParameter -> renderError(typeParameter.getName()) }.join())
append("<i> cannot be inferred</i>") append("<i> cannot be inferred</i>")
if (!inferredTypeParameters.isEmpty()) { if (!inferredTypeParameters.isEmpty()) {
append("; ") append("; ")
@@ -82,7 +91,7 @@ fun <D : CallableDescriptor> renderResolvedCall(resolvedCall: ResolvedCall<D>):
} }
append(resultingDescriptor.getName()).append("(") append(resultingDescriptor.getName()).append("(")
append(resultingDescriptor.getValueParameters().map { parameter -> renderParameter(parameter) }.join()) 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()) { if (!resolvedCall.getCandidateDescriptor().getTypeParameters().isEmpty()) {
appendTypeParametersSubstitution() appendTypeParametersSubstitution()