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

Got rid of unnecessary 'div' elements in table.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-14 19:48:45 +04:00
parent e9639ead91
commit 9d0a4155bb
3 changed files with 77 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java
+9 -9
View File
@@ -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("<td align=\"right\"><div style=\"white-space:nowrap;font-weight:bold;\">");
stringBuilder.append("<td align=\"right\" style=\"white-space:nowrap;font-weight:bold;\">");
}
@Override
@@ -169,12 +169,12 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer {
if (!last) {
stringBuilder.append(",");
}
stringBuilder.append("</div></td>");
stringBuilder.append("</td>");
}
@Override
public void appendBeforeValueParameters(@NotNull FunctionDescriptor function, @NotNull StringBuilder stringBuilder) {
stringBuilder.append("</div></td>");
stringBuilder.append("</td>");
if (function.getValueParameters().isEmpty()) {
tdBold(stringBuilder, "( )");
}
@@ -188,7 +188,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer {
if (!function.getValueParameters().isEmpty()) {
tdBold(stringBuilder, ")");
}
stringBuilder.append("<td><div style=\"white-space:nowrap;font-weight:bold;\">");
stringBuilder.append("<td style=\"white-space:nowrap;font-weight:bold;\">");
}
};
@@ -199,7 +199,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer {
.setTextFormat(DescriptorRenderer.TextFormat.HTML).build();
private static void td(StringBuilder builder, String text) {
builder.append("<td><div style=\"white-space:nowrap;\">").append(text).append("</div></td>");
builder.append("<td style=\"white-space:nowrap;\">").append(text).append("</td>");
}
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("<td colspan=\"").append(colspan).append("\"><div style=\"white-space:nowrap;\">").append(text).append("</div></td>");
builder.append("<td colspan=\"").append(colspan).append("\" style=\"white-space:nowrap;\">").append(text).append("</td>");
}
private static void tdBold(StringBuilder builder, String text) {
builder.append("<td><div style=\"white-space:nowrap;font-weight:bold;\">").append(text).append("</div></td>");
builder.append("<td style=\"white-space:nowrap;font-weight:bold;\">").append(text).append("</td>");
}
private static void tdRight(StringBuilder builder, String text) {
builder.append("<td align=\"right\"><div style=\"white-space:nowrap;\">").append(text).append("</div></td>");
builder.append("<td align=\"right\" style=\"white-space:nowrap;\">").append(text).append("</td>");
}
private static void tdRightBoldColspan(StringBuilder builder, int colspan, String text) {
builder.append("<td align=\"right\" colspan=\"").append(colspan).append("\"><div style=\"white-space:nowrap;font-weight:bold;\">").append(text).append("</div></td>");
builder.append("<td align=\"right\" colspan=\"").append(colspan).append("\" style=\"white-space:nowrap;font-weight:bold;\">").append(text).append("</td>");
}
public static String tableForTypes(String message, String firstDescription, TextElementType firstType, String secondDescription, TextElementType secondType) {
idea/testData/htmlTabledRenderer/diagnostic1.html
+35 -87
View File
@@ -5,165 +5,113 @@ T</b>
<tr>
<td width="10%">
</td>
<td align="right" colspan="2">
<div style="white-space:nowrap;font-weight:bold;">
<td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;">
<b>
fun</b>
&lt;T, E>
writeToMyList</div>
</td>
<td>
<div style="white-space:nowrap;font-weight:bold;">
(</div>
</td>
<td align="right">
<div style="white-space:nowrap;font-weight:bold;">
l : MyList&lt;in T&gt;,</div>
</td>
<td align="right">
<div style="white-space:nowrap;font-weight:bold;">
t : T</div>
</td>
<td>
<div style="white-space:nowrap;font-weight:bold;">
)</div>
</td>
<td>
<div style="white-space:nowrap;font-weight:bold;">
writeToMyList</td>
<td style="white-space:nowrap;font-weight:bold;">
(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
l : MyList&lt;in T&gt;,</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
t : T</td>
<td style="white-space:nowrap;font-weight:bold;">
)</td>
<td style="white-space:nowrap;font-weight:bold;">
: Unit <b>
where</b>
E : java.lang.Cloneable, E : java.io.Closeable</div>
</td>
E : java.lang.Cloneable, E : java.io.Closeable</td>
</tr>
<tr>
<td colspan="8">
<div style="white-space:nowrap;">
None of the following substitutions</div>
</td>
<td colspan="8" style="white-space:nowrap;">
None of the following substitutions</td>
</tr>
<tr>
<td width="10%">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
(</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
MyList&lt;in jet.Any&gt;</b>
</font>
<b>
,</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<b>
jet.Any</b>
</div>
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
)</b>
</div>
</td>
</tr>
<tr>
<td width="10%">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
(</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<b>
MyList&lt;in jet.Int&gt;</b>
<b>
,</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
jet.Int</b>
</font>
</div>
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
)</b>
</div>
</td>
</tr>
<tr>
<td colspan="8">
<div style="white-space:nowrap;">
can be applied to</div>
</td>
<td colspan="8" style="white-space:nowrap;">
can be applied to</td>
</tr>
<tr>
<td width="10%">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
(</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<b>
MyList&lt;jet.Int&gt;</b>
<b>
,</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<b>
jet.Any</b>
</div>
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
)</b>
</div>
</td>
</tr>
</table>
</html>
</html>
idea/testData/htmlTabledRenderer/diagnostic2.html
+33 -85
View File
@@ -5,163 +5,111 @@ T</b>
<tr>
<td width="10%">
</td>
<td align="right" colspan="2">
<div style="white-space:nowrap;font-weight:bold;">
<td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;">
<b>
ctor</b>
Cons&lt;T, E : java.lang.Cloneable>
</div>
</td>
<td>
<div style="white-space:nowrap;font-weight:bold;">
(</div>
</td>
<td align="right">
<div style="white-space:nowrap;font-weight:bold;">
l : MyList&lt;in T&gt;,</div>
</td>
<td align="right">
<div style="white-space:nowrap;font-weight:bold;">
t : T</div>
</td>
<td>
<div style="white-space:nowrap;font-weight:bold;">
)</div>
</td>
<td>
<div style="white-space:nowrap;font-weight:bold;">
</div>
<td style="white-space:nowrap;font-weight:bold;">
(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
l : MyList&lt;in T&gt;,</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
t : T</td>
<td style="white-space:nowrap;font-weight:bold;">
)</td>
<td style="white-space:nowrap;font-weight:bold;">
</td>
</tr>
<tr>
<td colspan="8">
<div style="white-space:nowrap;">
None of the following substitutions</div>
</td>
<td colspan="8" style="white-space:nowrap;">
None of the following substitutions</td>
</tr>
<tr>
<td width="10%">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
(</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
MyList&lt;in jet.Any&gt;</b>
</font>
<b>
,</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<b>
jet.Any</b>
</div>
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
)</b>
</div>
</td>
</tr>
<tr>
<td width="10%">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
(</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<b>
MyList&lt;in jet.Int&gt;</b>
<b>
,</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
jet.Int</b>
</font>
</div>
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
)</b>
</div>
</td>
</tr>
<tr>
<td colspan="8">
<div style="white-space:nowrap;">
can be applied to</div>
</td>
<td colspan="8" style="white-space:nowrap;">
can be applied to</td>
</tr>
<tr>
<td width="10%">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
</div>
<td style="white-space:nowrap;">
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
(</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<b>
MyList&lt;jet.Int&gt;</b>
<b>
,</b>
</div>
</td>
<td align="right">
<div style="white-space:nowrap;">
<td align="right" style="white-space:nowrap;">
<b>
jet.Any</b>
</div>
</td>
<td>
<div style="white-space:nowrap;">
<td style="white-space:nowrap;">
<b>
)</b>
</div>
</td>
</tr>
</table>
</html>
</html>