mirror of
https://github.com/golang/go
synced 2024-11-21 21:04:41 -07:00
go/printer, gofmt: use blank to separate import rename from import path
Note that declarations.golden is not using spaces for alignment (so that the alignment tabs are visible) which is why this change affects the test cases significantly. gofmt uses spaces for alignment (by default) and only tabs for indentation. gofmt -w src misc (no changes) Fixes #1673. R=iant CC=golang-dev https://golang.org/cl/4388044
This commit is contained in:
parent
8fc6703391
commit
ebaf01f052
@ -1200,7 +1200,7 @@ func (p *printer) spec(spec ast.Spec, n int, doIndent bool, multiLine *bool) {
|
||||
p.setComment(s.Doc)
|
||||
if s.Name != nil {
|
||||
p.expr(s.Name, multiLine)
|
||||
p.print(vtab)
|
||||
p.print(blank)
|
||||
}
|
||||
p.expr(s.Path, multiLine)
|
||||
p.setComment(s.Comment)
|
||||
|
29
src/pkg/go/printer/testdata/declarations.golden
vendored
29
src/pkg/go/printer/testdata/declarations.golden
vendored
@ -81,6 +81,35 @@ import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
// more import examples
|
||||
import (
|
||||
"xxx"
|
||||
"much longer name" // comment
|
||||
"short name" // comment
|
||||
)
|
||||
|
||||
import (
|
||||
_ "xxx"
|
||||
"much longer name" // comment
|
||||
)
|
||||
|
||||
import (
|
||||
mymath "math"
|
||||
"/foo/bar/long_package_path" // a comment
|
||||
)
|
||||
|
||||
import (
|
||||
"package_a" // comment
|
||||
"package_b"
|
||||
my_better_c "package_c" // comment
|
||||
"package_d" // comment
|
||||
my_e "package_e" // comment
|
||||
|
||||
"package_a" // comment
|
||||
"package_bb"
|
||||
"package_ccc" // comment
|
||||
"package_dddd" // comment
|
||||
)
|
||||
|
||||
// at least one empty line between declarations of different kind
|
||||
import _ "io"
|
||||
|
29
src/pkg/go/printer/testdata/declarations.input
vendored
29
src/pkg/go/printer/testdata/declarations.input
vendored
@ -81,6 +81,35 @@ import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
// more import examples
|
||||
import (
|
||||
"xxx"
|
||||
"much longer name" // comment
|
||||
"short name" // comment
|
||||
)
|
||||
|
||||
import (
|
||||
_ "xxx"
|
||||
"much longer name" // comment
|
||||
)
|
||||
|
||||
import (
|
||||
mymath "math"
|
||||
"/foo/bar/long_package_path" // a comment
|
||||
)
|
||||
|
||||
import (
|
||||
"package_a" // comment
|
||||
"package_b"
|
||||
my_better_c "package_c" // comment
|
||||
"package_d" // comment
|
||||
my_e "package_e" // comment
|
||||
|
||||
"package_a" // comment
|
||||
"package_bb"
|
||||
"package_ccc" // comment
|
||||
"package_dddd" // comment
|
||||
)
|
||||
|
||||
// at least one empty line between declarations of different kind
|
||||
import _ "io"
|
||||
|
Loading…
Reference in New Issue
Block a user