From 473fd854f8276c0b22f17fb458aa8f1a0e2cf5f5 Mon Sep 17 00:00:00 2001 From: Sebastien Binet Date: Tue, 17 Mar 2015 18:35:54 +0100 Subject: [PATCH] godoc/static: insert newlines in -src mode Running 'godoc -src' would end up with concatenated sources: $ godoc -src github.com/bradfitz/http2 Frame // a frameParser parses a frame given its FrameHeader and payload // bytes. The length of payload will always equal fh.Length (which // might be 0). type frameParser func(fh FrameHeader, payload []byte) (Frame, error)// A Frame is the base interface implemented by all frame types. // Callers will generally type-assert the specific frame type: // *HeadersFrame, *SettingsFrame, *WindowUpdateFrame, etc. // // Frames are only valid until the next call to Framer.ReadFrame. type Frame interface { Unconditionnally insert two newlines: $ godoc -src github.com/bradfitz/http2 Frame // a frameParser parses a frame given its FrameHeader and payload // bytes. The length of payload will always equal fh.Length (which // might be 0). type frameParser func(fh FrameHeader, payload []byte) (Frame, error) // A Frame is the base interface implemented by all frame types. // Callers will generally type-assert the specific frame type: // *HeadersFrame, *SettingsFrame, *WindowUpdateFrame, etc. // // Frames are only valid until the next call to Framer.ReadFrame. type Frame interface { Fixes #9726. Change-Id: I51ee04e53d4962c890ea601125eda8fce84d6a46 Reviewed-on: https://go-review.googlesource.com/7681 Reviewed-by: Robert Griesemer --- godoc/static/package.txt | 4 +++- godoc/static/static.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/godoc/static/package.txt b/godoc/static/package.txt index 868d0643..e53fa6ed 100644 --- a/godoc/static/package.txt +++ b/godoc/static/package.txt @@ -2,7 +2,9 @@ --------------------------------------- -*/}}{{if $filtered}}{{range .PAst}}{{range .Decls}}{{node $info .}}{{end}}{{end}}{{else}}{{with .PAst}}{{range $filename, $ast := .}}{{$filename}}: +*/}}{{if $filtered}}{{range .PAst}}{{range .Decls}}{{node $info .}} + +{{end}}{{end}}{{else}}{{with .PAst}}{{range $filename, $ast := .}}{{$filename}}: {{node $ $ast}}{{end}}{{end}}{{end}}{{/* --------------------------------------- diff --git a/godoc/static/static.go b/godoc/static/static.go index d3376eaf..642635bf 100644 --- a/godoc/static/static.go +++ b/godoc/static/static.go @@ -1828,7 +1828,9 @@ function cgAddChild(tree, ul, cgn) { --------------------------------------- -*/}}{{if $filtered}}{{range .PAst}}{{range .Decls}}{{node $info .}}{{end}}{{end}}{{else}}{{with .PAst}}{{range $filename, $ast := .}}{{$filename}}: +*/}}{{if $filtered}}{{range .PAst}}{{range .Decls}}{{node $info .}} + +{{end}}{{end}}{{else}}{{with .PAst}}{{range $filename, $ast := .}}{{$filename}}: {{node $ $ast}}{{end}}{{end}}{{end}}{{/* ---------------------------------------