Merge "Replace line breaks with spaces instead of nothing."
diff --git a/annotation/processors/changeid/src/java/com/android/compat/annotation/ChangeIdProcessor.java b/annotation/processors/changeid/src/java/com/android/compat/annotation/ChangeIdProcessor.java
index 0a7dbde..42bfd68 100644
--- a/annotation/processors/changeid/src/java/com/android/compat/annotation/ChangeIdProcessor.java
+++ b/annotation/processors/changeid/src/java/com/android/compat/annotation/ChangeIdProcessor.java
@@ -69,8 +69,7 @@
private static final String ENABLED_AFTER_CLASS_NAME = "android.compat.annotation.EnabledAfter";
private static final String TARGET_SDK_VERSION = "targetSdkVersion";
- private static final Pattern JAVADOC_SANITIZER = Pattern.compile("^\\s|\\n|\\r",
- Pattern.MULTILINE);
+ private static final Pattern JAVADOC_SANITIZER = Pattern.compile("^\\s", Pattern.MULTILINE);
@Override
public SourceVersion getSupportedSourceVersion() {
@@ -212,7 +211,8 @@
String description = null;
if (comment != null) {
- description = JAVADOC_SANITIZER.matcher(comment).replaceAll("").trim();
+ description = JAVADOC_SANITIZER.matcher(comment).replaceAll("").replaceAll("\\n",
+ " ").trim();
}
if (disabled && enabledAfter != null) {
diff --git a/annotation/processors/changeid/test/src/com/android/compat/annotation/ChangeIdProcessorTest.java b/annotation/processors/changeid/test/src/com/android/compat/annotation/ChangeIdProcessorTest.java
index 8ec3680..a72bffe 100644
--- a/annotation/processors/changeid/test/src/com/android/compat/annotation/ChangeIdProcessorTest.java
+++ b/annotation/processors/changeid/test/src/com/android/compat/annotation/ChangeIdProcessorTest.java
@@ -86,7 +86,7 @@
"import android.compat.annotation.Disabled;",
"public class Compat {",
" /**",
- " * description of ",
+ " * description of",
" * MY_CHANGE_ID",
" */",
" @EnabledAfter(targetSdkVersion=29)",
