qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-25 05:10:12 -06:00
Code Releases Activity

go/printer: leave indentation alone when printing nodes from different files

Browse Source 
ASTs may be created by various tools and built from nodes of
different files. An incorrectly constructed AST will likely
not print at all, but a (structurally) correct AST with bad
position information should still print structurally correct.

One heuristic used was to reset indentation when the filename
in the position information of nodes changed. However, this
can lead to wrong indentation for structurally correct ASTs.

Fix: Don't change the indentation in this case.

Related to issue 4300.

R=r
CC=golang-dev
https://golang.org/cl/6849066
This commit is contained in:
Robert Griesemer 2012-11-16 13:17:12 -08:00
parent a42e8a8086
commit de58eb9091
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pkg/go/printer/printer.go
View File

@ -225,7 +225,14 @@ func (p *printer) writeString(pos token.Position, s string, isLit bool) {
// (used when printing merged ASTs of different files // (used when printing merged ASTs of different files
// e.g., the result of ast.MergePackageFiles) // e.g., the result of ast.MergePackageFiles)
if p.last.IsValid() && p.last.Filename != pos.Filename { if p.last.IsValid() && p.last.Filename != pos.Filename {
p.indent = 0 // Note: Do not set p.indent to 0 - this seems to be a bad heuristic.
// ASTs may be created by various tools and built from nodes of
// different files. An incorrectly constructed AST will likely
// not print at all, but a (structurally) correct AST with bad
// position information should still print structurally correct.
// If p.indent is reset, indentation may be off, and likely lead
// to indentation underflow (to detect set: debug = true).
// See also issue 4300 (11/16/2012).
p.mode = 0 p.mode = 0
p.wsbuf = p.wsbuf[0:0] p.wsbuf = p.wsbuf[0:0]
} }