diff options
author | Daniel Martí <mvdan@mvdan.cc> | 2021-04-29 22:54:26 +0100 |
---|---|---|
committer | Daniel Martí <mvdan@mvdan.cc> | 2021-04-30 16:17:01 +0000 |
commit | cc02d59e84b60b3221e6c079afe04d3b7e59b872 (patch) | |
tree | 62cc6d8a2646ca2abc2cfcb4d852be6cf35e841e /src/cmd/gofmt | |
parent | 0dfb6fb4907c770269d5530f210567e371eebeaa (diff) | |
download | go-cc02d59e84b60b3221e6c079afe04d3b7e59b872.tar.gz go-cc02d59e84b60b3221e6c079afe04d3b7e59b872.zip |
cmd/gofmt: always format non-directory arguments again
golang.org/cl/284138 introduced a regression: running "gofmt foo" would
silently ignore the file due to its lack of a ".go" extension, whereas
the tool is documented otherwise:
Given a file, it operates on that file; given a directory, it
operates on all .go files in that directory, recursively.
This wasn't caught as there were no tests for these edge cases. gofmt's
own tests are regular Go tests, so it's hard to test it properly without
adding an abstraction layer on top of func main.
Luckily, this kind of test is a great fit for cmd/go's own script tests,
and it just takes a few straightforward lines.
Finally, add the relevant logic back, with documentation to clarify its
intentional purpose.
Fixes #45859.
Change-Id: Ic5bf5937b8f95fcdad2b6933227c8b504ef38a82
Reviewed-on: https://go-review.googlesource.com/c/go/+/315270
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
Trust: Daniel Martí <mvdan@mvdan.cc>
Trust: Robert Griesemer <gri@golang.org>
Trust: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/gofmt')
-rw-r--r-- | src/cmd/gofmt/gofmt.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/cmd/gofmt/gofmt.go b/src/cmd/gofmt/gofmt.go index fef86c941f..b3c120daab 100644 --- a/src/cmd/gofmt/gofmt.go +++ b/src/cmd/gofmt/gofmt.go @@ -214,8 +214,19 @@ func gofmtMain() { } for _, arg := range args { - if err := filepath.WalkDir(arg, visitFile); err != nil { + switch info, err := os.Stat(arg); { + case err != nil: report(err) + case !info.IsDir(): + // Non-directory arguments are always formatted. + if err := processFile(arg, nil, os.Stdout, false); err != nil { + report(err) + } + default: + // Directories are walked, ignoring non-Go files. + if err := filepath.WalkDir(arg, visitFile); err != nil { + report(err) + } } } } |