commit 8a8ff49b7c8b579ec1f0314188435a1f77bf72a1
author Rico Wind <ricow@google.com> Tue Jan 24 11:28:51 2023 +0000
committer Rico Wind <ricow@google.com> Tue Jan 24 11:29:58 2023 +0000
tree 1f02815d4143632918a9d219af993c299d52ee5e
parent 57ee0e61a093b506aec5e8590f8dda42e80ed081

Revert "Updated doc printing to match the real doc"

This reverts commit 7e0530e7a7e1dac86b000e8f21cfbe9eb1c9d9a7.

Reason for revert:breaks none bots, see https://storage.googleapis.com/r8-test-results/linux-none_ed9fbf643766f47ed4118273f6e39275fc7c4bec/test/classes/com.android.tools.r8.desugar.desugaredlibrary.LintFilesTest.html#testFileContent[none,%20spec:%20JDK11]

Change-Id: Ie2455955615e87d83e22c7e3a50535e1fa79d6a1

src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateLintFiles.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateLintFiles.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateLintFiles.java
index 18ab413..752964b 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateLintFiles.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateLintFiles.java
@@ -459,23 +459,6 @@
       return this;
     }
 
-    StringBuilderWithIndent appendLineStart(String lineStart) {
-      builder.append(indent);
-      builder.append(lineStart);
-      return this;
-    }
-
-    StringBuilderWithIndent append(String string) {
-      builder.append(string);
-      return this;
-    }
-
-    StringBuilderWithIndent appendLineEnd(String lineEnd) {
-      builder.append(lineEnd);
-      builder.append(NL);
-      return this;
-    }
-
     StringBuilderWithIndent appendLine(String line) {
       builder.append(indent);
       builder.append(line);
@@ -685,21 +668,8 @@
       indent(indent);
     }
 
-    HTMLBuilder appendTdPackage(String s) {
-      appendLineStart("<td><code><em>" + s + "</em></code><br>");
-      if (s.startsWith("java.time")) {
-        append("<a href=\"#java-time-customizations\">See customizations</a><br");
-      } else if (s.startsWith("java.nio")) {
-        append("<a href=\"#java-nio-customizations\">See customizations</a><br");
-      }
-      return this;
-    }
-
-    HTMLBuilder appendTdClassName(String s) {
-      appendLineEnd(
-          "<code><br><br><div style=\"font-size:small;font-weight:bold;\">&nbsp;"
-              + s
-              + "</div></code><br><br></td>");
+    HTMLBuilder appendTdCode(String s) {
+      appendLine("<td><code>" + s + "</code></td>");
       return this;
     }
 
@@ -709,7 +679,7 @@
     }
 
     HTMLBuilder appendLiCode(String s) {
-      appendLine("<li class=\"java8_table\"><code>" + s + "</code></li>");
+      appendLine("<li><code>" + s + "</code></li>");
       return this;
     }
 
@@ -745,14 +715,10 @@
       HTMLBuilder builder = new HTMLBuilder();
       builder.start("tr");
       if (packageName.length() > 0) {
-        builder.appendTdPackage(packageName);
+        builder.appendTdCode(packageName);
       }
-      builder.appendTdClassName(typeInPackage(className));
-      builder
-          .start("td")
-          .start(
-              "ul style=\"list-style-position:inside; list-style-type: none !important;"
-                  + " margin-left:0px;padding-left:0px !important;\"");
+      builder.appendTdCode(typeInPackage(className));
+      builder.start("td").start("ul");
       if (!fields.isEmpty()) {
         assert newClass; // Currently no fields are added to existing classes.
         for (DexEncodedField field : fields) {