1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/squareup/javapoet/CodeBlock.java b/src/main/java/com/squareup/javapoet/CodeBlock.java
index 33e3846..02542f5 100644
--- a/src/main/java/com/squareup/javapoet/CodeBlock.java
+++ b/src/main/java/com/squareup/javapoet/CodeBlock.java
@@ -189,7 +189,7 @@ public final class CodeBlock {
       while (p < format.length()) {
         int nextP = format.indexOf("$", p);
         if (nextP == -1) {
-          formatParts.add(format.substring(p, format.length()));
+          formatParts.add(format.substring(p));
           break;
         }
 
@@ -424,6 +424,12 @@ public final class CodeBlock {
       return this;
     }
 
+    public Builder clear() {
+      formatParts.clear();
+      args.clear();
+      return this;
+    }
+
     public CodeBlock build() {
       return new CodeBlock(this);
     }