Merge pull request #113 from rinchsan/revert-misfixing-commit

internal/imports/fix_test.go

@@ -377,6 +377,51 @@ func f() {
 `,
 	},
 
+	// Don't touch import lines in raw string
+	{
+		name: "import_lines_in_raw_string",
+		in: `package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println("hello world")
+}
+
+const helloWorld = ` + "`" + `
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println("hello world")
+}` + "`\n",
+		out: `package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println("hello world")
+}
+
+const helloWorld = ` + "`" + `
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println("hello world")
+}` + "`\n",
+	},
+
 	// Put some things in their own section
 	{
 		name: "make_sections",

internal/imports/imports.go

@@ -260,6 +260,7 @@ func separateImportsIntoGroups(r io.Reader, impsByGroup map[int][]*ast.ImportSpe
 	var out bytes.Buffer
 	in := bufio.NewReader(r)
 	inImports := false
+	done := false
 	impInserted := false
 	for {
 		s, err := in.ReadString('\n')
@@ -269,7 +270,7 @@ func separateImportsIntoGroups(r io.Reader, impsByGroup map[int][]*ast.ImportSpe
 			return nil, err
 		}
 
-		if !inImports && strings.HasPrefix(s, "import") && strings.Contains(s, "(") {
+		if !inImports && !done && strings.HasPrefix(s, "import") && strings.Contains(s, "(") {
 			inImports = true
 			fmt.Fprint(&out, s)
 			continue
@@ -297,6 +298,7 @@ func separateImportsIntoGroups(r io.Reader, impsByGroup map[int][]*ast.ImportSpe
 			continue
 		}
 		if inImports && !strings.Contains(s, "//") && strings.Contains(s, ")") {
+			done = true
 			inImports = false
 		}