diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java b/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java index 79056df76ab..7f8b9422334 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java @@ -160,7 +160,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { private static final DescriptorRenderer.ValueParametersHandler VALUE_PARAMETERS_HANDLER = new DescriptorRenderer.ValueParametersHandler() { @Override public void appendBeforeValueParameter(@NotNull ValueParameterDescriptor parameter, @NotNull StringBuilder stringBuilder) { - stringBuilder.append("
"); + stringBuilder.append(""); } @Override @@ -169,12 +169,12 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { if (!last) { stringBuilder.append(","); } - stringBuilder.append("
"); + stringBuilder.append(""); } @Override public void appendBeforeValueParameters(@NotNull FunctionDescriptor function, @NotNull StringBuilder stringBuilder) { - stringBuilder.append(""); + stringBuilder.append(""); if (function.getValueParameters().isEmpty()) { tdBold(stringBuilder, "( )"); } @@ -188,7 +188,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { if (!function.getValueParameters().isEmpty()) { tdBold(stringBuilder, ")"); } - stringBuilder.append("
"); + stringBuilder.append(""); } }; @@ -199,7 +199,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { .setTextFormat(DescriptorRenderer.TextFormat.HTML).build(); private static void td(StringBuilder builder, String text) { - builder.append("
").append(text).append("
"); + builder.append("").append(text).append(""); } private static void tdSpace(StringBuilder builder) { @@ -207,19 +207,19 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { } private static void tdColspan(StringBuilder builder, String text, int colspan) { - builder.append("
").append(text).append("
"); + builder.append("").append(text).append(""); } private static void tdBold(StringBuilder builder, String text) { - builder.append("
").append(text).append("
"); + builder.append("").append(text).append(""); } private static void tdRight(StringBuilder builder, String text) { - builder.append("
").append(text).append("
"); + builder.append("").append(text).append(""); } private static void tdRightBoldColspan(StringBuilder builder, int colspan, String text) { - builder.append("
").append(text).append("
"); + builder.append("").append(text).append(""); } public static String tableForTypes(String message, String firstDescription, TextElementType firstType, String secondDescription, TextElementType secondType) { diff --git a/idea/testData/htmlTabledRenderer/diagnostic1.html b/idea/testData/htmlTabledRenderer/diagnostic1.html index bf758c7d08b..7c0972d4372 100644 --- a/idea/testData/htmlTabledRenderer/diagnostic1.html +++ b/idea/testData/htmlTabledRenderer/diagnostic1.html @@ -5,165 +5,113 @@ T - -
+ fun <T, E> - writeToMyList
- - -
-(
- - -
-l : MyList<in T>,
- - -
-t : T
- - -
-)
- - -
+ writeToMyList + +( + +l : MyList<in T>, + +t : T + +) + : Unit where - E : java.lang.Cloneable, E : java.io.Closeable
- + E : java.lang.Cloneable, E : java.io.Closeable - -
-None of the following substitutions
- + +None of the following substitutions - -
-
+ - -
-
+ - -
+ ( -
- -
+ MyList<in jet.Any> , -
- -
+ jet.Any -
- -
+ ) -
- -
-
+ - -
-
+ - -
+ ( -
- -
+ MyList<in jet.Int> , -
- -
+ jet.Int -
- -
+ ) -
- -
-can be applied to
- + +can be applied to - -
-
+ - -
-
+ - -
+ ( -
- -
+ MyList<jet.Int> , -
- -
+ jet.Any -
- -
+ ) -
- + \ No newline at end of file diff --git a/idea/testData/htmlTabledRenderer/diagnostic2.html b/idea/testData/htmlTabledRenderer/diagnostic2.html index d334375751b..7fbd9705fc1 100644 --- a/idea/testData/htmlTabledRenderer/diagnostic2.html +++ b/idea/testData/htmlTabledRenderer/diagnostic2.html @@ -5,163 +5,111 @@ T - -
+ ctor Cons<T, E : java.lang.Cloneable> -
- -
-(
- - -
-l : MyList<in T>,
- - -
-t : T
- - -
-)
- - -
-
+ +( + +l : MyList<in T>, + +t : T + +) + - -
-None of the following substitutions
- + +None of the following substitutions - -
-
+ - -
-
+ - -
+ ( -
- -
+ MyList<in jet.Any> , -
- -
+ jet.Any -
- -
+ ) -
- -
-
+ - -
-
+ - -
+ ( -
- -
+ MyList<in jet.Int> , -
- -
+ jet.Int -
- -
+ ) -
- -
-can be applied to
- + +can be applied to - -
-
+ - -
-
+ - -
+ ( -
- -
+ MyList<jet.Int> , -
- -
+ jet.Any -
- -
+ ) -
- + \ No newline at end of file