Add a space after semicolons in TWR

cushon · cushon · commit 5ddd7612bf97 · 2016-02-19T16:52:02.000-08:00
Section 4.6.2 of the style guide requires a space after semicolons. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=115091197
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -1851,8 +1851,10 @@ public boolean visit(TryStatement node) {
         visit(resource);
         first = false;
       }
-      // TODO(cushon): emit a space after the optional trailing semi-colon
-      builder.guessToken(";");
+      if (builder.peekToken().equals(Optional.of(";"))) {
+        token(";");
+        builder.space();
+      }
       token(")");
       builder.close();
       builder.space();
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B21585653.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B21585653.output
@@ -1,5 +1,5 @@
 class B21585653 {
   {
-    try (X x = x;) {}
+    try (X x = x; ) {}
   }
 }
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B26159561.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B26159561.output
@@ -2,6 +2,6 @@ class B26159561 {
   {
     try (A a = a();
         B b = b()) {}
-    try (A a = a();) {}
+    try (A a = a(); ) {}
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`class B21585653 {`
`2`	`2`	`{`
`3`		`- try (X x = x;) {}`
	`3`	`+ try (X x = x; ) {}`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ class B26159561 {`
`2`	`2`	`{`
`3`	`3`	`try (A a = a();`
`4`	`4`	`B b = b()) {}`
`5`		`- try (A a = a();) {}`
	`5`	`+ try (A a = a(); ) {}`
`6`	`6`	`}`
`7`	`7`	`}`