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

Implemented highlighting arguments which don't fit in tooltip.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-04-20 13:27:53 +04:00
parent 60622337c3
commit eddc550139
1 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java
+64 -31
View File
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1;
@@ -30,13 +31,15 @@ import org.jetbrains.jet.lang.diagnostics.rendering.*;
import org.jetbrains.jet.lang.psi.JetValueArgument; import org.jetbrains.jet.lang.psi.JetValueArgument;
import org.jetbrains.jet.lang.psi.JetValueArgumentList; import org.jetbrains.jet.lang.psi.JetValueArgumentList;
import org.jetbrains.jet.lang.psi.ValueArgument; import org.jetbrains.jet.lang.psi.ValueArgument;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.FqName;
import org.jetbrains.jet.lang.resolve.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.calls.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.ResolvedCallImpl; import org.jetbrains.jet.lang.resolve.calls.ResolvedCallImpl;
import org.jetbrains.jet.lang.resolve.calls.ResolvedValueArgument; import org.jetbrains.jet.lang.resolve.calls.ResolvedValueArgument;
import org.jetbrains.jet.resolve.DescriptorRenderer; import org.jetbrains.jet.resolve.DescriptorRenderer;
import java.util.Collection; import java.util.*;
import java.util.Map;
import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.diagnostics.Errors.*;
import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.*; import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.*;
@@ -83,39 +86,69 @@ public class IdeErrorMessages {
return null; return null;
} }
@NotNull private Set<ValueParameterDescriptor> getParametersToHighlight(ResolvedCall<? extends CallableDescriptor> call) {
@Override Set<ValueParameterDescriptor> parameters = new HashSet<ValueParameterDescriptor>();
public String render(@NotNull Collection<? extends ResolvedCall<? extends CallableDescriptor>> calls) { if (call instanceof ResolvedCallImpl) {
StringBuilder stringBuilder = new StringBuilder(""); Collection<Diagnostic> diagnostics = ((ResolvedCallImpl)call).getTrace().getBindingContext().getDiagnostics();
for (ResolvedCall<? extends CallableDescriptor> call : calls) { for (Diagnostic diagnostic : diagnostics) {
stringBuilder.append("<li>"); //stringBuilder.append(DefaultErrorMessages.RENDERER.render(diagnostic));
stringBuilder.append(DescriptorRenderer.HTML.render(call.getResultingDescriptor())); PsiElement element = diagnostic.getPsiElement();
if (call instanceof ResolvedCallImpl) { JetValueArgumentList argumentList = PsiTreeUtil.getParentOfType(element, JetValueArgumentList.class, false);
Collection<Diagnostic> diagnostics = ((ResolvedCallImpl)call).getTrace().getBindingContext().getDiagnostics(); assert argumentList != null;
stringBuilder.append(" | "); JetValueArgument argument = PsiTreeUtil.getParentOfType(element, JetValueArgument.class, false);
for (Diagnostic diagnostic : diagnostics) { if (diagnostic.getFactory() == Errors.TOO_MANY_ARGUMENTS) {
//stringBuilder.append(DefaultErrorMessages.RENDERER.render(diagnostic)); parameters.add(null);
PsiElement element = diagnostic.getPsiElement(); } else if (diagnostic.getFactory() == Errors.NO_VALUE_FOR_PARAMETER) {
JetValueArgumentList argumentList = PsiTreeUtil.getParentOfType(element, JetValueArgumentList.class, false); ValueParameterDescriptor parameter =
assert argumentList != null; ((DiagnosticWithParameters1<PsiElement, ValueParameterDescriptor>)diagnostic).getA();
JetValueArgument argument = PsiTreeUtil.getParentOfType(element, JetValueArgument.class, false); parameters.add(parameter);
if (diagnostic.getFactory() == Errors.TOO_MANY_ARGUMENTS) { } else {
stringBuilder.append("LAST )"); if (argument != null) {
} else if (diagnostic.getFactory() == Errors.NO_VALUE_FOR_PARAMETER) { assert argument.getParent() == argumentList; // TODO check that this really can't happen
ValueParameterDescriptor valueParameterDescriptor = ValueParameterDescriptor parameter = findParameterByArgumentExpression(call, argument);
((DiagnosticWithParameters1<PsiElement, ValueParameterDescriptor>)diagnostic).getA(); if (parameter != null) {
stringBuilder.append("ARGUMENT ").append(valueParameterDescriptor.getName()).append(" "); parameters.add(parameter);
} else {
if (argument != null) {
assert argument.getParent() == argumentList; // TODO check that this really can't happen
ValueParameterDescriptor parameter = findParameterByArgumentExpression(call, argument);
if (parameter != null) {
stringBuilder.append("ARGUMENT ").append(parameter.getName()).append(" ");
}
} }
} }
} }
} }
}
return parameters;
}
@NotNull
@Override
public String render(@NotNull Collection<? extends ResolvedCall<? extends CallableDescriptor>> calls) {
String RED_TEMPLATE = "<font color=red><b>%s</b></font>";
StringBuilder stringBuilder = new StringBuilder("");
for (ResolvedCall<? extends CallableDescriptor> call : calls) {
stringBuilder.append("<li>");
CallableDescriptor funDescriptor = call.getResultingDescriptor();
Set<ValueParameterDescriptor> parametersToHighlight = getParametersToHighlight(call);
stringBuilder.append(funDescriptor.getName()).append("(");
boolean first = true;
DescriptorRenderer htmlRend = DescriptorRenderer.HTML;
for (ValueParameterDescriptor parameter : funDescriptor.getValueParameters()) {
if (!first) {
stringBuilder.append(", ");
}
String paramType = htmlRend.renderType(parameter.getType());
if (parametersToHighlight.contains(parameter)) {
paramType = String.format(RED_TEMPLATE, paramType);
}
stringBuilder.append(paramType);
first = false;
}
stringBuilder.append(parametersToHighlight.contains(null) ? String.format(RED_TEMPLATE, ")") : ")");
stringBuilder.append(" ").append(htmlRend.renderMessage("defined in")).append(" ");
DeclarationDescriptor containingDeclaration = funDescriptor.getContainingDeclaration();
if (containingDeclaration != null) {
FqNameUnsafe fqName = DescriptorUtils.getFQName(containingDeclaration);
stringBuilder.append(FqName.ROOT.toUnsafe().equals(fqName) ? "root package" : fqName.getFqName());
}
stringBuilder.append("</li>"); stringBuilder.append("</li>");
} }
return stringBuilder.toString(); return stringBuilder.toString();