qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 20:40:03 -07:00
Code Releases Activity

cmd/gofmt: always format non-directory arguments again

Browse Source 
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>
This commit is contained in:
Daniel Martí 2021-04-29 22:54:26 +01:00
parent 0dfb6fb490
commit cc02d59e84
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cmd/go/testdata/script/fmt_load_errors.txt vendored
View File

@ -6,6 +6,17 @@ go fmt -n exclude
stdout 'exclude[/\\]x\.go'
stdout 'exclude[/\\]x_linux\.go'
# Test edge cases with gofmt.
# Note that this execs GOROOT/bin/gofmt.
! exec gofmt does-not-exist
exec gofmt gofmt-dir/no-extension
stdout 'package x'
exec gofmt gofmt-dir
! stdout 'package x'
-- exclude/empty/x.txt --
-- exclude/ignore/_x.go --
package x
@ -17,3 +28,5 @@ package x
// +build windows
package x
-- gofmt-dir/no-extension --
package x

13
src/cmd/gofmt/gofmt.go
View File

@ -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)
}
}
}
}