From: Robert Griesemer <gri@golang.org>
Date: Tue, 30 Mar 2010 18:19:58 +0000 (-0700)
Subject: godoc: don't print package clause in -src command-line mode with filtering
X-Git-Tag: weekly.2010-03-30~10
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6a71a4639efa9eb629919b3035f80fd131c76274;p=gostls13.git

godoc: don't print package clause in -src command-line mode with filtering

R=rsc
CC=golang-dev
https://golang.org/cl/844041
---

diff --git a/src/cmd/godoc/main.go b/src/cmd/godoc/main.go
index 0ab1898f61..0ede0dcc94 100644
--- a/src/cmd/godoc/main.go
+++ b/src/cmd/godoc/main.go
@@ -355,7 +355,18 @@ func main() {
 		switch {
 		case info.PAst != nil:
 			ast.FilterFile(info.PAst, filter)
-			info.PAst.Doc = nil // don't show package comment in this case
+			// Special case: Don't use templates for printing
+			// so we only get the filtered declarations without
+			// package clause or extra whitespace.
+			for i, d := range info.PAst.Decls {
+				if i > 0 {
+					fmt.Println()
+				}
+				writeAny(os.Stdout, d, *html)
+				fmt.Println()
+			}
+			return
+
 		case info.PDoc != nil:
 			info.PDoc.Filter(filter)
 		}