Indent list items 2 spaces (in addition to any indentation from nested lists)

MOE_MIGRATED_REVID=134770008

Author: cpovirk

core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java

@@ -51,6 +51,7 @@ final class JavadocWriter {
   private boolean continuingListItemOfInnermostList;
   private boolean continuingFooterTag;
   private final NestingCounter continuingListItemCount = new NestingCounter();
+  private final NestingCounter continuingListCount = new NestingCounter();
   private int remainingOnLine;
   private boolean atStartOfLine;
   private RequestedWhitespace requestedWhitespace = NONE;
@@ -103,6 +104,7 @@ void writeFooterJavadocTagStart(Token token) {
      */
     continuingListItemOfInnermostList = false;
     continuingListItemCount.reset();
+    continuingListCount.reset();
 
     if (!wroteAnythingSignificant) {
       // Javadoc consists solely of tags. This is frowned upon in general but OK for @Overrides.
@@ -123,6 +125,7 @@ void writeListOpen(Token token) {
 
     writeToken(token);
     continuingListItemOfInnermostList = false;
+    continuingListCount.increment();
 
     requestNewline();
   }
@@ -131,6 +134,7 @@ void writeListClose(Token token) {
     requestNewline();
 
     continuingListItemCount.decrementIfPositive();
+    continuingListCount.decrementIfPositive();
     writeToken(token);
 
     // TODO(cushon): only if continuingListItemCount == 0?
@@ -378,7 +382,7 @@ enum AutoIndent {
   }
 
   private int innerIndent() {
-    int innerIndent = continuingListItemCount.value() * 4;
+    int innerIndent = continuingListItemCount.value() * 4 + continuingListCount.value() * 2;
     if (continuingFooterTag) {
       innerIndent += 4;
     }

core/src/test/java/com/google/googlejavaformat/java/JavadocFormattingTest.java

@@ -698,14 +698,14 @@ public void lists() {
       " * Foo.",
       " *",
       " * <ul>",
-      " * <li>1",
-      " *     <ul>",
-      " *     <li>1a",
-      " *     <li>1b",
-      " *     </ul>",
-      " *     more 1",
-      " *     <p>still more 1",
-      " * <li>2",
+      " *   <li>1",
+      " *       <ul>",
+      " *         <li>1a",
+      " *         <li>1b",
+      " *       </ul>",
+      " *       more 1",
+      " *       <p>still more 1",
+      " *   <li>2",
       " * </ul>",
       " */",
       "class Test {}",
@@ -729,9 +729,9 @@ public void listItemWrap() {
       " * Foo.",
       " *",
       " * <ul>",
-      " * <li>234567890 234567890 234567890 234567890 234567890 234567890 234567890 234567890"
+      " *   <li>234567890 234567890 234567890 234567890 234567890 234567890 234567890 234567890"
           + " 234567890",
-      " *     234567890",
+      " *       234567890",
       " * </ul>",
       " */",
       "class Test {}",
@@ -755,7 +755,7 @@ public void unclosedList() {
       " * Foo.",
       " *",
       " * <ul>",
-      " * <li>1",
+      " *   <li>1",
       " *",
       " * @return blah",
       " */",
@@ -928,10 +928,10 @@ public void paramsOtherIndents() {
       " * @param foo a",
       " *     <p>b",
       " *     <ul>",
-      " *     <li>a",
-      " *         <ul>",
-      " *         <li>x",
-      " *         </ul>",
+      " *       <li>a",
+      " *           <ul>",
+      " *             <li>x",
+      " *           </ul>",
       " *     </ul>",
       " *", // TODO(cpovirk): Ideally we would probably eliminate this.
       " * @param bar another",
@@ -1066,8 +1066,8 @@ public void inferParagraphTags() {
       " * </pre>",
       " *",
       " * <ul>",
-      " * <li>foo",
-      " *     <p>bar",
+      " *   <li>foo",
+      " *       <p>bar",
       " * </ul>",
       " */",
       "class Test {}",

core/src/test/resources/com/google/googlejavaformat/java/testdata/B30153869.output

@@ -2,7 +2,7 @@
  * one
  *
  * <ol>
- * <li>two
+ *   <li>two
  * </ol>
  *
  * <p>
@@ -14,13 +14,13 @@ class T {
    * One
    *
    * <ul>
-   * <li>a
-   *     <ul>
-   *     <li>b
-   *     <li>c
-   *     </ul>
+   *   <li>a
+   *       <ul>
+   *         <li>b
+   *         <li>c
+   *       </ul>
    *
-   * <li>e
+   *   <li>e
    * </ul>
    */
   int x;