Fix and regression test #405.

jdf · jdf · commit b06f563ce0a3 · 2010-12-04T19:17:27.000Z
diff --git a/app/src/processing/app/format/AutoFormat.java b/app/src/processing/app/format/AutoFormat.java
@@ -301,7 +301,6 @@ private boolean lookup_com(final String keyword) {
   }
 
   public String format(final String source) {
-    // Adding an additional newline as a hack around other errors
     final String normalizedText = source.replaceAll("\r", "");
     final String cleanText = normalizedText
         + (normalizedText.endsWith("\n") ? "" : "\n");
@@ -592,10 +591,20 @@ public String format(final String source) {
       case '(':
         castFlags.push(Pattern.matches("^.*?(?:int|color|float)\\s*$", buf));
 
+        final boolean isFor = lookup("for");
+        final boolean isIf = lookup("if");
+
+        if (isFor || isIf || lookup("while")) {
+          if (!Character.isWhitespace(buf.charAt(buf.length() - 1))) {
+            buf.append(' ');
+          }
+        }
+
         buf.append(c);
         paren++;
 
-        if ((lookup("for"))) {
+        if (isFor) {
+          // TODO(feinberg): handle new-style for loops
           c = get_string();
           while (c != ';' && c != ':') {
             c = get_string();
@@ -618,8 +627,7 @@ public String format(final String source) {
           } // endwhile for_done
           paren--;
           if (paren < 0) {
-            paren = 0;//EOF = true;
-            //System.out.println("eof d");
+            paren = 0;
           }
           writeIndentedLine();
           if (getnl()) {
@@ -629,9 +637,7 @@ public String format(final String source) {
             ind[level] = 0;
           }
           break;
-        }
-
-        if (lookup("if")) {
+        } else if (isIf) {
           writeIndentedLine();
           s_tabs[c_level][if_lev] = tabs;
           sp_flg[c_level][if_lev] = p_flg[level];
diff --git a/app/test/resources/bug405.expected b/app/test/resources/bug405.expected
@@ -0,0 +1,3 @@
+for (int i : new int[] {1,2,3}) {
+  println(i);
+}
diff --git a/app/test/resources/bug405.pde b/app/test/resources/bug405.pde
@@ -0,0 +1,3 @@
+for(int i : new int[] {1,2,3}) {
+  println(i);
+}
diff --git a/app/test/src/test/processing/parsing/AutoFormatTests.java b/app/test/src/test/processing/parsing/AutoFormatTests.java
@@ -51,6 +51,11 @@ public void bug109() {
     expectGood("bug109");
   }
 
+  @Test
+  public void bug405() {
+    expectGood("bug405");
+  }
+  
   @Test
   public void bug420() {
     expectGood("bug420");

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+for (int i : new int[] {1,2,3}) {`
	`2`	`+ println(i);`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+for(int i : new int[] {1,2,3}) {`
	`2`	`+ println(i);`
	`3`	`+}`