Preserve ellipses when formatting parameter comments. PiperOrigin-RevId: 488956140
diff --git a/core/src/main/java/com/google/googlejavaformat/CommentsHelper.java b/core/src/main/java/com/google/googlejavaformat/CommentsHelper.java index 2b78961..1e33003 100644 --- a/core/src/main/java/com/google/googlejavaformat/CommentsHelper.java +++ b/core/src/main/java/com/google/googlejavaformat/CommentsHelper.java
@@ -46,5 +46,5 @@ Pattern PARAMETER_COMMENT = Pattern.compile( - "/\\*\\s*(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)(\\Q...\\E)?\\s*=\\s*\\*/"); + "/\\*\\s*(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*(\\Q...\\E)?)\\s*=\\s*\\*/"); }
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/ParameterComment.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/ParameterComment.input index 58590ac..decebe9 100644 --- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/ParameterComment.input +++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/ParameterComment.input
@@ -23,4 +23,7 @@ /*k=*/ 1); g(/*a=*/ 1, /*b=*/ 1, /*c=*/ 1, /*d=*/ 1, /*e=*/ 1, /*f=*/ 1, /*g=*/ 1, /*h=*/ 1, /*i=*/ 1); } + static void h(Object... xs) { + h(/*xs...=*/ null); + } }
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/ParameterComment.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/ParameterComment.output index 5616ec0..d26ca11 100644 --- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/ParameterComment.output +++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/ParameterComment.output
@@ -31,4 +31,8 @@ /* h= */ 1, /* i= */ 1); } + + static void h(Object... xs) { + h(/* xs...= */ null); + } }