qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 19:54:41 -07:00
Code Releases Activity

go/printer, gofmt: fix formatting of expression lists (missing blank)

Browse Source 
This appears to have been a long-standing formatting bug.
The test cases has misformatted golden files.

Applied gofmt -w src misc .

Fixes #1839.

R=iant
CC=golang-dev
https://golang.org/cl/4515113
This commit is contained in:
Robert Griesemer 2011-05-19 17:05:35 -07:00
parent 2f5a77cd5e
commit b790ae2efb
8 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pkg/go/printer/nodes.go
View File

@ -215,12 +215,13 @@ func (p *printer) exprList(prev0 token.Pos, list []ast.Expr, depth int, mode exp
}
if i > 0 {
if mode&commaSep != 0 {
switch {
case mode&commaSep != 0:
p.print(token.COMMA)
}
if mode&periodSep != 0 {
case mode&periodSep != 0:
p.print(token.PERIOD)
}
needsBlank := mode&periodSep == 0 // period-separated list elements don't need a blank
if prevLine < line && prevLine > 0 && line > 0 {
// lines are broken using newlines so comments remain aligned
// unless forceFF is set or there are multiple expressions on
@ -229,11 +230,12 @@ func (p *printer) exprList(prev0 token.Pos, list []ast.Expr, depth int, mode exp
ws = ignore
*multiLine = true
prevBreak = i
needsBlank = false // we got a line break instead
}
} else if mode&periodSep == 0 {
}
if needsBlank {
p.print(blank)
}
// period-separated list elements don't need a blank
}
if isPair && size > 0 && len(list) > 1 {