Remove line breaks between param comments and params

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=154233543

Author: cushon

core/src/main/java/com/google/googlejavaformat/java/JavaInput.java

@@ -487,7 +487,14 @@ private static ImmutableList<Token> buildTokens(List<Tok> toks) {
     OUTERMOST:
     while (k < kN) {
       while (!toks.get(k).isToken()) {
-        toksBefore.add(toks.get(k++));
+        Tok tok = toks.get(k++);
+        toksBefore.add(tok);
+        if (isParamComment(tok)) {
+          while (toks.get(k).isNewline()) {
+            // drop newlines after parameter comments
+            k++;
+          }
+        }
       }
       Tok tok = toks.get(k++);
 
@@ -543,8 +550,7 @@ private static ImmutableList<Token> buildTokens(List<Tok> toks) {
 
   private static boolean isParamComment(Tok tok) {
     return tok.isSlashStarComment()
-        && tok.getText().endsWith("*/")
-        && tok.getText().substring(0, tok.getText().length() - "*/".length()).trim().endsWith("=");
+        && tok.getText().matches("\\/\\*[A-Za-z0-9\\s_\\-]+=\\s*\\*\\/");
   }
 
   /**

core/src/test/resources/com/google/googlejavaformat/java/testdata/B26694550.input

@@ -1,7 +1,20 @@
 class B26694550 {
   {
+    /* === not a param comment */
     fffffffffffffffffffffffffffffff(
-        ImmutableList.copyOf(keys), /*keepGoing=*/
+        ImmutableList.copyOf(keys), /*&=*//*keepGoing=*/
+        false,
+        ggggggggggggggggggggggggggggggggggggggggggg);
+    fffffffffffffffffffffffffffffff(
+        ImmutableList.copyOf(keys),
+        /*keepGoing=*/
+        false,
+        ggggggggggggggggggggggggggggggggggggggggggg);
+    fffffffffffffffffffffffffffffff(
+        ImmutableList.copyOf(keys),
+        /*foo_bar=*/
+        false,
+        /*foo-bar=*/
         false,
         ggggggggggggggggggggggggggggggggggggggggggg);
   }

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

@@ -1,8 +1,18 @@
 class B26694550 {
   {
+    /* === not a param comment */
+    fffffffffffffffffffffffffffffff(
+        ImmutableList.copyOf(keys), /*&=*/
+        /*keepGoing=*/ false,
+        ggggggggggggggggggggggggggggggggggggggggggg);
     fffffffffffffffffffffffffffffff(
         ImmutableList.copyOf(keys),
         /*keepGoing=*/ false,
         ggggggggggggggggggggggggggggggggggggggggggg);
+    fffffffffffffffffffffffffffffff(
+        ImmutableList.copyOf(keys),
+        /*foo_bar=*/ false,
+        /*foo-bar=*/ false,
+        ggggggggggggggggggggggggggggggggggggggggggg);
   }
 }