commit 11da845071c661565d88bbdac1c0884e8b263d60
author jichao <jichao@google.com> Wed Mar 20 15:56:19 2019 -0700
committer Liam Miller-Cushon <cushon@google.com> Wed Apr 03 14:13:44 2019 -0700
tree ad9ab828f2159ba4bebb799f83536e5af1560757
parent ee1e59447ca853e2b5928ec6bbdc388898a42e74

Automated rollback of commit 8b28725c4934a294bf57586cf41181207faa378f

*** Original change description ***

Unify breaks before expressions ending in toBuilder and stream

***

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

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

diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
index 83f1353..6f59e6d 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -14,7 +14,6 @@
 
 package com.google.googlejavaformat.java;
 
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.getLast;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.googlejavaformat.Doc.FillMode.INDEPENDENT;
@@ -1531,8 +1530,7 @@
       return false;
     }
     parts.addFirst(curr);
-    visitDotWithPrefix(
-        ImmutableList.copyOf(parts), false, ImmutableList.of(parts.size() - 1), INDEPENDENT);
+    visitDotWithPrefix(ImmutableList.copyOf(parts), false, ImmutableList.of(parts.size() - 1));
     return true;
   }
 
@@ -1555,17 +1553,16 @@
           "withCause",
           "withStackTrace");
 
-  private static ImmutableList<Long> handleStream(List<ExpressionTree> parts) {
+  private static Stream<Long> handleStream(List<ExpressionTree> parts) {
     return indexes(
-            parts.stream(),
-            p -> {
-              if (!(p instanceof MethodInvocationTree)) {
-                return false;
-              }
-              Name name = getMethodName((MethodInvocationTree) p);
-              return Stream.of("stream", "toBuilder").anyMatch(name::contentEquals);
-            })
-        .collect(toImmutableList());
+        parts.stream(),
+        p -> {
+          if (!(p instanceof MethodInvocationTree)) {
+            return false;
+          }
+          Name name = getMethodName((MethodInvocationTree) p);
+          return Stream.of("stream", "toBuilder").anyMatch(name::contentEquals);
+        });
   }
 
   private static <T> Stream<Long> indexes(Stream<T> stream, Predicate<T> predicate) {
@@ -2692,11 +2689,10 @@
       }
     }
 
-    ImmutableList<Long> streamPrefixes = handleStream(items);
-    streamPrefixes.forEach(x -> prefixes.add(x.intValue()));
+    handleStream(items).forEach(x -> prefixes.add(x.intValue()));
+
     if (!prefixes.isEmpty()) {
-      visitDotWithPrefix(
-          items, needDot, prefixes, streamPrefixes.isEmpty() ? INDEPENDENT : UNIFIED);
+      visitDotWithPrefix(items, needDot, prefixes);
     } else {
       visitRegularDot(items, needDot);
     }
@@ -2792,10 +2788,7 @@
    *     a syntactic unit
    */
   private void visitDotWithPrefix(
-      List<ExpressionTree> items,
-      boolean needDot,
-      Collection<Integer> prefixes,
-      FillMode prefixFillMode) {
+      List<ExpressionTree> items, boolean needDot, Collection<Integer> prefixes) {
     // Are there method invocations or field accesses after the prefix?
     boolean trailingDereferences = !prefixes.isEmpty() && getLast(prefixes) < items.size() - 1;
 
@@ -2811,7 +2804,7 @@
       if (needDot) {
         FillMode fillMode;
         if (!unconsumedPrefixes.isEmpty() && i <= unconsumedPrefixes.peekFirst()) {
-          fillMode = prefixFillMode;
+          fillMode = FillMode.INDEPENDENT;
         } else {
           fillMode = FillMode.UNIFIED;
         }

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

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B124394008.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B124394008.input
deleted file mode 100644
index 0b51407..0000000
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B124394008.input
+++ /dev/null
@@ -1,8 +0,0 @@
-class B124394008 {
-  {
-    LocalReviewProto.Builder newReview =
-        readProfileResponse.flatMap(authorExtractor::extract)
-            .map(luReviewsExtractor::toLocalReviewProto)
-            .orElse(LocalReviewProto.getDefaultInstance()).toBuilder();
-  }
-}

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

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B124394008.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B124394008.output
deleted file mode 100644
index 176b46a..0000000
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B124394008.output
+++ /dev/null
@@ -1,10 +0,0 @@
-class B124394008 {
-  {
-    LocalReviewProto.Builder newReview =
-        readProfileResponse
-            .flatMap(authorExtractor::extract)
-            .map(luReviewsExtractor::toLocalReviewProto)
-            .orElse(LocalReviewProto.getDefaultInstance())
-            .toBuilder();
-  }
-}