Merge pull request #225 from dhleong/master

Fix nextControlFlow not accepting arguments
square · Feb 11, 2015 · 33bb07e · 33bb07e
2 parents a8b85d1 + cbe76bb
commit 33bb07e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/main/java/com/squareup/javapoet/CodeBlock.java b/src/main/java/com/squareup/javapoet/CodeBlock.java
@@ -143,9 +143,7 @@ public Builder beginControlFlow(String controlFlow, Object... args) {
      */
     public Builder nextControlFlow(String controlFlow, Object... args) {
       unindent();
-      add("} ", args);
-      add(controlFlow, args);
-      add(" {\n", args);
+      add("} " + controlFlow + " {\n", args);
       indent();
       return this;
     }

diff --git a/src/test/java/com/squareup/javapoet/TypeSpecTest.java b/src/test/java/com/squareup/javapoet/TypeSpecTest.java
@@ -1546,4 +1546,31 @@ private String toString(TypeSpec typeSpec) {
         + "}\n"
     );
   }
+
+  @Test public void tryCatch() {
+    TypeSpec taco = TypeSpec.classBuilder("Taco")
+      .addMethod(
+        MethodSpec.methodBuilder("addTopping")
+          .addParameter(ClassName.get("com.squareup.tacos", "Topping"), "topping")
+          .beginControlFlow("try")
+          .addCode("/* do something tricky with the topping */\n")
+          .nextControlFlow("catch ($T e)",
+            ClassName.get("com.squareup.tacos", "IllegalToppingException"))
+          .endControlFlow()
+          .build()
+      )
+      .build();
+    assertThat(toString(taco)).isEqualTo(""
+        + "package com.squareup.tacos;\n"
+        + "\n"
+        + "class Taco {\n"
+        + "  void addTopping(Topping topping) {\n"
+        + "    try {\n"
+        + "      /* do something tricky with the topping */\n"
+        + "    } catch (IllegalToppingException e) {\n"
+        + "    }\n"
+        + "  }\n"
+        + "}\n"
+    );
+  }
 }