Wrap before /*parameter=*/ comments

cushon · ronshapiro · commit ca0c4d90cdbb · 2017-04-26T16:05:29.000-04:00
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=154055948
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInput.java
@@ -481,10 +481,11 @@ private static ImmutableList<Token> buildTokens(List<Tok> toks) {
     int k = 0;
     int kN = toks.size();
 
-    while (k < kN) {
-      // Remaining non-tokens before the token go here.
-      ImmutableList.Builder<Tok> toksBefore = ImmutableList.builder();
+    // Remaining non-tokens before the token go here.
+    ImmutableList.Builder<Tok> toksBefore = ImmutableList.builder();
 
+    OUTERMOST:
+    while (k < kN) {
       while (!toks.get(k).isToken()) {
         toksBefore.add(toks.get(k++));
       }
@@ -519,17 +520,33 @@ private static ImmutableList<Token> buildTokens(List<Tok> toks) {
               break;
           }
         }
+        if (isParamComment(toks.get(k))) {
+          tokens.add(new Token(toksBefore.build(), tok, toksAfter.build()));
+          toksBefore = ImmutableList.<Tok>builder().add(toks.get(k++));
+          // drop newlines after parameter comments
+          while (toks.get(k).isNewline()) {
+            k++;
+          }
+          continue OUTERMOST;
+        }
         Tok nonTokenAfter = toks.get(k++);
         toksAfter.add(nonTokenAfter);
         if (Newlines.containsBreaks(nonTokenAfter.getText())) {
           break;
         }
       }
       tokens.add(new Token(toksBefore.build(), tok, toksAfter.build()));
+      toksBefore = ImmutableList.builder();
     }
     return tokens.build();
   }
 
+  private static boolean isParamComment(Tok tok) {
+    return tok.isSlashStarComment()
+        && tok.getText().endsWith("*/")
+        && tok.getText().substring(0, tok.getText().length() - "*/".length()).trim().endsWith("=");
+  }
+
   /**
    * Convert from an offset and length flag pair to a token range.
    *
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B26694550.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B26694550.input
@@ -0,0 +1,8 @@
+class B26694550 {
+  {
+    fffffffffffffffffffffffffffffff(
+        ImmutableList.copyOf(keys), /*keepGoing=*/
+        false,
+        ggggggggggggggggggggggggggggggggggggggggggg);
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B26694550.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B26694550.output
@@ -0,0 +1,8 @@
+class B26694550 {
+  {
+    fffffffffffffffffffffffffffffff(
+        ImmutableList.copyOf(keys),
+        /*keepGoing=*/ false,
+        ggggggggggggggggggggggggggggggggggggggggggg);
+  }
+}
