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

Trace usage in renderer replaced with usage of argument to parameter map

Browse Source
This commit is contained in:
Svetlana Isakova
2014-04-18 16:06:14 +04:00
parent 928b28e080
commit 4a8255a606
4 changed files with 31 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java
+7 -54
View File
@@ -16,21 +16,12 @@
package org.jetbrains.jet.plugin.highlighter;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1;
import org.jetbrains.jet.lang.diagnostics.Errors;
import org.jetbrains.jet.lang.psi.JetValueArgument;
import org.jetbrains.jet.lang.psi.ValueArgument;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.calls.inference.InferenceErrorData;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallImpl;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument;
import org.jetbrains.jet.lang.resolve.calls.model.*;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.types.JetType;
@@ -38,11 +29,10 @@ import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.renderer.Renderer;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.*;
import static org.jetbrains.jet.lang.resolve.calls.util.UtilPackage.hasErrorOnParameter;
import static org.jetbrains.jet.lang.resolve.calls.util.UtilPackage.hasUnmappedArguments;
public class IdeRenderers {
private static final String RED_TEMPLATE = "<font color=red><b>%s</b></font>";
@@ -85,51 +75,14 @@ public class IdeRenderers {
public static final Renderer<Collection<? extends ResolvedCall<?>>> HTML_NONE_APPLICABLE_CALLS =
new Renderer<Collection<? extends ResolvedCall<?>>>() {
@Nullable
private ValueParameterDescriptor findParameterByArgumentExpression(ResolvedCall<?> call, JetValueArgument argument) {
for (Map.Entry<ValueParameterDescriptor, ResolvedValueArgument> entry : call.getValueArguments().entrySet()) {
for (ValueArgument va : entry.getValue().getArguments()) {
if (va == argument) {
return entry.getKey();
}
}
}
return null;
}
private Set<ValueParameterDescriptor> getParametersToHighlight(ResolvedCall<?> call) {
Set<ValueParameterDescriptor> parameters = new HashSet<ValueParameterDescriptor>();
if (call instanceof ResolvedCallImpl) {
Iterable<Diagnostic> diagnostics = ((ResolvedCallImpl)call).getTrace().getBindingContext().getDiagnostics();
for (Diagnostic diagnostic : diagnostics) {
if (diagnostic.getFactory() == Errors.TOO_MANY_ARGUMENTS) {
parameters.add(null);
} else if (diagnostic.getFactory() == Errors.NO_VALUE_FOR_PARAMETER) {
ValueParameterDescriptor parameter =
((DiagnosticWithParameters1<PsiElement, ValueParameterDescriptor>)diagnostic).getA();
parameters.add(parameter);
} else {
JetValueArgument argument = PsiTreeUtil.getParentOfType(diagnostic.getPsiElement(), JetValueArgument.class, false);
if (argument != null) {
ValueParameterDescriptor parameter = findParameterByArgumentExpression(call, argument);
if (parameter != null) {
parameters.add(parameter);
}
}
}
}
}
return parameters;
}
@NotNull
@Override
public String render(@NotNull Collection<? extends ResolvedCall<?>> calls) {
StringBuilder stringBuilder = new StringBuilder("");
for (ResolvedCall<?> call : calls) {
for (ResolvedCall<?> resolvedCall : calls) {
stringBuilder.append("<li>");
CallableDescriptor funDescriptor = call.getResultingDescriptor();
Set<ValueParameterDescriptor> parametersToHighlight = getParametersToHighlight(call);
CallableDescriptor funDescriptor = resolvedCall.getResultingDescriptor();
DescriptorRenderer htmlRenderer = DescriptorRenderer.HTML;
ReceiverParameterDescriptor receiverParameter = funDescriptor.getReceiverParameter();
@@ -151,14 +104,14 @@ public class IdeRenderers {
if (parameter.hasDefaultValue()) {
paramString += " = ...";
}
if (parametersToHighlight.contains(parameter)) {
if (hasErrorOnParameter(resolvedCall, parameter)) {
paramString = String.format(RED_TEMPLATE, paramString);
}
stringBuilder.append(paramString);
first = false;
}
stringBuilder.append(parametersToHighlight.contains(null) ? String.format(RED_TEMPLATE, ")") : ")");
stringBuilder.append(hasUnmappedArguments(resolvedCall) ? String.format(RED_TEMPLATE, ")") : ")");
stringBuilder.append(" <i>defined in</i> ");
DeclarationDescriptor containingDeclaration = funDescriptor.getContainingDeclaration();
FqNameUnsafe fqName = DescriptorUtils.getFqName(containingDeclaration);
idea/testData/diagnosticMessage/noneApplicable.kt
+11
View File
@@ -0,0 +1,11 @@
// !DIAGNOSTICS_NUMBER: 1
// !DIAGNOSTICS: NONE_APPLICABLE
// !MESSAGE_TYPE: HTML
fun foo(i: Int, s: String, b: Boolean) {}
fun foo(b: Boolean, s: String) {}
fun foo(i: Int) {}
fun test() {
foo(1, "")
}
idea/testData/diagnosticMessage/noneApplicable1.html
+8
View File
@@ -0,0 +1,8 @@
<!-- noneApplicable1 -->
<html>
None of the following functions can be called with the arguments supplied. <ul>
<li>foo(kotlin.Int, kotlin.String, <font color=red><b>kotlin.Boolean</b></font>) <i>defined in</i> root package</li>
<li>foo(<font color=red><b>kotlin.Boolean</b></font>, kotlin.String) <i>defined in</i> root package</li>
<li>foo(kotlin.Int<font color=red><b>)</b></font> <i>defined in</i> root package</li>
</ul>
</html>
idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java
+5
View File
@@ -96,6 +96,11 @@ public class DiagnosticMessageTestGenerated extends AbstractDiagnosticMessageTes
doTest("idea/testData/diagnosticMessage/nameInConstraintIsNotATypeParameter.kt");
}
@TestMetadata("noneApplicable.kt")
public void testNoneApplicable() throws Exception {
doTest("idea/testData/diagnosticMessage/noneApplicable.kt");
}
@TestMetadata("numberValueTypes.kt")
public void testNumberValueTypes() throws Exception {
doTest("idea/testData/diagnosticMessage/numberValueTypes.kt");