Fix Anko converter

fix/anko.go

@@ -2,6 +2,7 @@ package fix
 
 import (
 	"bytes"
+	"fmt"
 	"strings"
 
 	"github.com/gobuffalo/plush"
@@ -12,30 +13,35 @@ func Anko(content string) (string, error) {
 	bb := &bytes.Buffer{}
 
 	lines := strings.Split(content, "\n")
+	l := len(lines)
 
-	// fix create_table
-	inCreateTable := false
-	for i := 0; i < len(lines); i++ {
+	for i := 0; i < l; i++ {
 		line := lines[i]
 		tl := strings.TrimSpace(line)
 		if strings.HasPrefix(tl, "create_table") {
-			line = strings.Replace(line, ", func(t) {", ") {", -1)
-			inCreateTable = true
-		}
-		if strings.HasPrefix(tl, "}") && inCreateTable {
-			inCreateTable = false
-		}
-		if strings.HasPrefix(tl, "})") && inCreateTable {
-			line = "}"
-			inCreateTable = false
-		}
-		lines[i] = line
-	}
-
-	// fix raw
-	for i, line := range lines {
-		tl := strings.TrimSpace(line)
-		if strings.HasPrefix(tl, "raw(") {
+			// skip already converted create_table
+			if strings.Contains(line, ", func(t) {") {
+				// fix create_table
+				line = strings.Replace(line, ", func(t) {", ") {", -1)
+				ll := i
+				lines[i] = line
+				for {
+					if strings.HasPrefix(tl, "})") {
+						line = "}"
+						break
+					} else if strings.HasPrefix(tl, "}") {
+						break
+					}
+					i++
+					line = lines[i]
+					tl = strings.TrimSpace(line)
+					if l == i {
+						return "", fmt.Errorf("unclosed create_table statement line %d", ll+1)
+					}
+				}
+			}
+		} else if strings.HasPrefix(tl, "raw(") {
+			// fix raw
 			line = strings.Replace(line, "raw(", "sql(", -1)
 		}
 		lines[i] = line

fix/fixtures/pass/0001_with_raw_backticks.anko.fizz

@@ -8,9 +8,14 @@ create_table("users", func(t) {
   t.Column("joined_at", "timestamp", {})
 })
 
-create_table("domains") {
+create_table("domains", func(t) {
+  t.Column("id","uuid",{"primary":true})
+})
+
+create_table("sodas", func(t) {
   t.Column("id","uuid",{"primary":true})
 }
+)
 
 raw(`
     INSERT INTO users (email, twitter_handle, joined_at, created_at, updated_at)