Remove spaces after <li> tags.
MOE_MIGRATED_REVID=144721661
diff --git a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java
index f2769e7..b27a551 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java
@@ -23,7 +23,7 @@
import static com.google.googlejavaformat.java.javadoc.JavadocWriter.RequestedWhitespace.NONE;
import static com.google.googlejavaformat.java.javadoc.JavadocWriter.RequestedWhitespace.WHITESPACE;
import static com.google.googlejavaformat.java.javadoc.Token.Type.HEADER_OPEN_TAG;
-import static com.google.googlejavaformat.java.javadoc.Token.Type.LIST_OPEN_TAG;
+import static com.google.googlejavaformat.java.javadoc.Token.Type.LIST_ITEM_OPEN_TAG;
import static com.google.googlejavaformat.java.javadoc.Token.Type.PARAGRAPH_OPEN_TAG;
import com.google.common.base.Strings;
@@ -404,5 +404,5 @@
* LITERAL (because they require other special handling).
*/
private static final ImmutableSet<Type> START_OF_LINE_TOKENS =
- immutableEnumSet(LIST_OPEN_TAG, PARAGRAPH_OPEN_TAG, HEADER_OPEN_TAG);
+ immutableEnumSet(LIST_ITEM_OPEN_TAG, PARAGRAPH_OPEN_TAG, HEADER_OPEN_TAG);
}
diff --git a/core/src/test/java/com/google/googlejavaformat/java/JavadocFormattingTest.java b/core/src/test/java/com/google/googlejavaformat/java/JavadocFormattingTest.java
index defd31d..a371f39 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/JavadocFormattingTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/JavadocFormattingTest.java
@@ -1090,6 +1090,20 @@
}
@Test
+ public void listItemSpaces() throws Exception {
+ String input =
+ new String(
+ ByteStreams.toByteArray(getClass().getResourceAsStream("testjavadoc/B31404367.input")),
+ UTF_8);
+ String expected =
+ new String(
+ ByteStreams.toByteArray(getClass().getResourceAsStream("testjavadoc/B31404367.output")),
+ UTF_8);
+ String output = formatter.formatSource(input);
+ assertThat(output).isEqualTo(expected);
+ }
+
+ @Test
public void htmlTagsInCode() {
String[] input = {
"/** abc {@code {} <p> <li> <pre> <table>} def */", //
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testjavadoc/B31404367.input b/core/src/test/resources/com/google/googlejavaformat/java/testjavadoc/B31404367.input
new file mode 100644
index 0000000..5bf96da
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testjavadoc/B31404367.input
@@ -0,0 +1,8 @@
+/**
+ * Foo.
+ *
+ * <ul>
+ * <li> a
+ * </ul>
+ */
+class Foo {}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testjavadoc/B31404367.output b/core/src/test/resources/com/google/googlejavaformat/java/testjavadoc/B31404367.output
new file mode 100644
index 0000000..39d08bc
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testjavadoc/B31404367.output
@@ -0,0 +1,8 @@
+/**
+ * Foo.
+ *
+ * <ul>
+ * <li>a
+ * </ul>
+ */
+class Foo {}
