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

Added valid rendering varargs and parameters with default values in NONE_APPLICABLE diagnostic.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-04-20 19:14:54 +04:00
parent 0f0330a4b4
commit 466e669727
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java
+17 -5
View File
@@ -37,9 +37,13 @@ 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.lang.types.JetType;
import org.jetbrains.jet.resolve.DescriptorRenderer; import org.jetbrains.jet.resolve.DescriptorRenderer;
import java.util.*; import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
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.*;
@@ -191,11 +195,19 @@ public class IdeErrorMessages {
if (!first) { if (!first) {
stringBuilder.append(", "); stringBuilder.append(", ");
} }
String paramType = htmlRend.renderType(parameter.getType()); JetType type = parameter.getType();
if (parametersToHighlight.contains(parameter)) { JetType varargElementType = parameter.getVarargElementType();
paramType = String.format(RED_TEMPLATE, paramType); if (varargElementType != null) {
type = varargElementType;
} }
stringBuilder.append(paramType); String paramString = (varargElementType != null ? "<b>vararg</b> " : "") + htmlRend.renderType(type);
if (parameter.hasDefaultValue()) {
paramString += " = ...";
}
if (parametersToHighlight.contains(parameter)) {
paramString = String.format(RED_TEMPLATE, paramString);
}
stringBuilder.append(paramString);
first = false; first = false;
} }