code review 99400043: go.tools/imports: fix case where output not gofmt-compatible

go.tools/imports: fix case where output not gofmt-compatible

Fixes 7866. Adds a test case.

When trying to add newlines before certain imports via text manipulation,
a regex is used to iterate over all imports. The regex failed to match
dot imports because \w doesn't match a literal dot. This changes the regex
to accept a dot as well.

[shurcooL, 2014-05-20 03:01:51]

Hello bradfitz@golang.org (cc: golang-codereviews@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/go.tools

[bradfitz, 2014-05-20 21:02:11]

LGTM

Thanks!



On Mon, May 19, 2014 at 8:01 PM, <shurcooL@gmail.com> wrote:

> Reviewers: bradfitz,
>
> Message:
> Hello bradfitz@golang.org (cc: golang-codereviews@googlegroups.com),
>
> I'd like you to review this change to
> https://code.google.com/p/go.tools
>
>
> Description:
> go.tools/imports: fix case where output not gofmt-compatible
>
> Fixes 7866. Adds a test case.
>
> When trying to add newlines before certain imports via text
> manipulation,
> a regex is used to iterate over all imports. The regex failed to match
> dot imports because \w doesn't match a literal dot. This changes the
> regex
> to accept a dot as well.
>
> Please review this at https://codereview.appspot.com/99400043/
>
> Affected files (+44, -1 lines):
>   M imports/fix_test.go
>   M imports/imports.go
>
>
> Index: imports/fix_test.go
> ===================================================================
> --- a/imports/fix_test.go
> +++ b/imports/fix_test.go
> @@ -575,6 +575,49 @@
>  }
>  `,
>         },
> +
> +       // Blank line can be added before all types of import declarations.
> +       // golang.org/issue/7866
> +       {
> +               name: "issue 7866",
> +               in: `package main
> +
> +import (
> +       "fmt"
> +       renamed_bar "github.com/foo/bar"
> +
> +       . "github.com/foo/baz"
> +       "io"
> +
> +       _ "github.com/foo/qux"
> +       "strings"
> +)
> +
> +func main() {
> +       _, _, _, _, _ = fmt.Errorf, io.Copy, strings.Contains,
> renamed_bar.A, B
> +}
> +`,
> +               out: `package main
> +
> +import (
> +       "fmt"
> +
> +       renamed_bar "github.com/foo/bar"
> +
> +       "io"
> +
> +       . "github.com/foo/baz"
> +
> +       "strings"
> +
> +       _ "github.com/foo/qux"
> +)
> +
> +func main() {
> +       _, _, _, _, _ = fmt.Errorf, io.Copy, strings.Contains,
> renamed_bar.A, B
> +}
> +`,
> +       },
>  }
>
>  func TestFixImports(t *testing.T) {
> Index: imports/imports.go
> ===================================================================
> --- a/imports/imports.go
> +++ b/imports/imports.go
> @@ -238,7 +238,7 @@
>         return b.Bytes()
>  }
>
> -var impLine = regexp.MustCompile(`^\s+(?:\w+\s+)?"(.+)"`)
> +var impLine = regexp.MustCompile(`^\s+(?:[\w\.]+\s+)?"(.+)"`)
>
>  func addImportSpaces(r io.Reader, breaks []string) []byte {
>         var out bytes.Buffer
>
>
>

[bradfitz, 2014-05-20 21:02:18]

*** Submitted as
https://code.google.com/p/go/source/detail?r=fe1f51e06216&repo=tools ***

go.tools/imports: fix case where output not gofmt-compatible

Fixes 7866. Adds a test case.

When trying to add newlines before certain imports via text manipulation,
a regex is used to iterate over all imports. The regex failed to match
dot imports because \w doesn't match a literal dot. This changes the regex
to accept a dot as well.

LGTM=bradfitz
R=bradfitz
CC=golang-codereviews
https://codereview.appspot.com/99400043

Committer: Brad Fitzpatrick <bradfitz@golang.org>