Treat expressions ending in .toBuilder() as a syntactic unit

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=237907460
google · Apr 3, 2019 · a24c9b6 · a24c9b6
1 parent 6b57fbf
commit a24c9b6
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 12 deletions.
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -1553,18 +1553,20 @@ private boolean handleLogStatement(MethodInvocationTree node) {
           "withCause",
           "withStackTrace");
 
-  private static Optional<Long> handleStream(List<ExpressionTree> parts) {
-    return indexIn(
+  private static Stream<Long> handleStream(List<ExpressionTree> parts) {
+    return indexes(
         parts.stream(),
-        p ->
-            (p instanceof MethodInvocationTree)
-                && getMethodName((MethodInvocationTree) p).contentEquals("stream"));
+        p -> {
+          if (!(p instanceof MethodInvocationTree)) {
+            return false;
+          }
+          Name name = getMethodName((MethodInvocationTree) p);
+          return Stream.of("stream", "toBuilder").anyMatch(name::contentEquals);
+        });
   }
 
-  private static <T> Optional<Long> indexIn(Stream<T> stream, Predicate<T> predicate) {
-    return Streams.mapWithIndex(stream, (x, i) -> predicate.apply(x) ? i : -1)
-        .filter(x -> x != -1)
-        .findFirst();
+  private static <T> Stream<Long> indexes(Stream<T> stream, Predicate<T> predicate) {
+    return Streams.mapWithIndex(stream, (x, i) -> predicate.apply(x) ? i : -1).filter(x -> x != -1);
   }
 
   @Override
@@ -2687,7 +2689,7 @@ void visitDot(ExpressionTree node0) {
       }
     }
 
-    handleStream(items).ifPresent(x -> prefixes.add(x.intValue()));
+    handleStream(items).forEach(x -> prefixes.add(x.intValue()));
 
     if (!prefixes.isEmpty()) {
       visitDotWithPrefix(items, needDot, prefixes);

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B112853497.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B112853497.input
@@ -0,0 +1,12 @@
+class B112853497 {
+  {
+    XxxxxxxxxxXxxx xxxXxxxx =
+        xxxXxxxx
+            .xxxxXxXxxxx(xxxxXxxx, XXXXXX_XXXX_XXXXXXXX_XX_XXXXXXXX)
+            .toBuilder()
+            .xxxXxxxxXxxxXx(xxxxxXx.xxxXxxxxXxxxXx())
+            .xxxXxxxxXxxxXx(xxxxxXx.xxxXxxxxXxxxXx())
+            .xxxXxxxxx(xxxxxx.xxxXxxxxxXxxx())
+            .xxxxx();
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B112853497.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B112853497.output
@@ -0,0 +1,10 @@
+class B112853497 {
+  {
+    XxxxxxxxxxXxxx xxxXxxxx =
+        xxxXxxxx.xxxxXxXxxxx(xxxxXxxx, XXXXXX_XXXX_XXXXXXXX_XX_XXXXXXXX).toBuilder()
+            .xxxXxxxxXxxxXx(xxxxxXx.xxxXxxxxXxxxXx())
+            .xxxXxxxxXxxxXx(xxxxxXx.xxxXxxxxXxxxXx())
+            .xxxXxxxxx(xxxxxx.xxxXxxxxxXxxx())
+            .xxxxx();
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B26928842.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B26928842.output
@@ -1,8 +1,7 @@
 class B26928842 {
   {
     curr.setData(
-        curr.getData()
-            .toBuilder()
+        curr.getData().toBuilder()
             .setPushCertificate( // New
                 curr.getData().getPushCertficate()) // Old, misspelled
             .clearPushCertficate() // Old, misspelled