commit c83047cadf2cd8a3241a213160d386895d583237
author cushon <cushon@google.com> Tue Apr 25 10:33:42 2017 -0700
committer Ron Shapiro <shapiro.rd@gmail.com> Wed Apr 26 16:05:29 2017 -0400
tree 24bf0f207637333fd9d633564a892a9c3afb249d
parent ca0c4d90cdbb46b3a2bf9c2b83d0bd558cccc41e

Fix indentation of for loop variable declarations

with multiple declaration fragments. Previously there was an extra +4 indent:

for (int x = 1, //
        y = 2; ; ) {}

The indent handling is only needed if the first fragment is not a declaration:

int x, y;
for (x = 1, //
        y = 2; ; ) {}

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

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 32080e2..d381455 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -950,7 +950,11 @@
     builder.space();
     token("(");
     builder.open(plusFour);
-    builder.open(node.getInitializer().size() <= 1 ? ZERO : plusFour);
+    builder.open(
+        node.getInitializer().size() > 1
+                && node.getInitializer().get(0).getKind() == Tree.Kind.EXPRESSION_STATEMENT
+            ? plusFour
+            : ZERO);
     if (!node.getInitializer().isEmpty()) {
       if (node.getInitializer().get(0).getKind() == VARIABLE) {
         PeekingIterator<StatementTree> it =

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

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B37629610.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B37629610.input
new file mode 100644
index 0000000..65d9d47
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B37629610.input
@@ -0,0 +1,16 @@
+class B37629610 {
+  private static ImmutableList<InputOutputPair> toInputOutputPairs(Options options) {
+    for (Iterator<Path> inputIt = options.inputJars.iterator(),
+                outputIt = options.outputJars.iterator();
+        inputIt.hasNext();
+        ) {}
+    for (Iterator<Path> inputIt = options.inputJars.iterator(),
+                outputIt = options.outputJars.iterator();
+        ;
+        inputIt.next()) {}
+    for (inputIt = options.inputJars.iterator(), //
+            outputIt = options.outputJars.iterator();
+        ;
+        inputIt.next()) {}
+  }
+}

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

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B37629610.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B37629610.output
new file mode 100644
index 0000000..c3ea0da
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B37629610.output
@@ -0,0 +1,16 @@
+class B37629610 {
+  private static ImmutableList<InputOutputPair> toInputOutputPairs(Options options) {
+    for (Iterator<Path> inputIt = options.inputJars.iterator(),
+            outputIt = options.outputJars.iterator();
+        inputIt.hasNext();
+        ) {}
+    for (Iterator<Path> inputIt = options.inputJars.iterator(),
+            outputIt = options.outputJars.iterator();
+        ;
+        inputIt.next()) {}
+    for (inputIt = options.inputJars.iterator(), //
+            outputIt = options.outputJars.iterator();
+        ;
+        inputIt.next()) {}
+  }
+}