godoc: don't show testdata directories

griesemer · griesemer · commit 999c77d78a7f · 2012-02-23T12:23:17.000-08:00
R=golang-dev, bradfitz, dsymonds, minux.ma, rsc CC=golang-dev https://golang.org/cl/5700043
diff --git a/src/cmd/godoc/dirtrees.go b/src/cmd/godoc/dirtrees.go
@@ -17,6 +17,11 @@ import (
 	"strings"
 )
 
+// Conventional name for directories containing test data.
+// Excluded from directory trees.
+//
+const testdataDirName = "testdata"
+
 type Directory struct {
 	Depth int
 	Path  string // includes Name
@@ -49,7 +54,7 @@ type treeBuilder struct {
 }
 
 func (b *treeBuilder) newDirTree(fset *token.FileSet, path, name string, depth int) *Directory {
-	if b.pathFilter != nil && !b.pathFilter(path) {
+	if b.pathFilter != nil && !b.pathFilter(path) || name == testdataDirName {
 		return nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,11 @@ import (`
`17`	`17`	`"strings"`
`18`	`18`	`)`
`19`	`19`
	`20`	`+// Conventional name for directories containing test data.`
	`21`	`+// Excluded from directory trees.`
	`22`	`+//`
	`23`	`+const testdataDirName = "testdata"`
	`24`	`+`
`20`	`25`	`type Directory struct {`
`21`	`26`	`Depth int`
`22`	`27`	`Path string // includes Name`
`@@ -49,7 +54,7 @@ type treeBuilder struct {`
`49`	`54`	`}`
`50`	`55`
`51`	`56`	`func (b treeBuilder) newDirTree(fset token.FileSet, path, name string, depth int) *Directory {`
`52`		`- if b.pathFilter != nil && !b.pathFilter(path) {`
	`57`	`+ if b.pathFilter != nil && !b.pathFilter(path) \|\| name == testdataDirName {`
`53`	`58`	`return nil`
`54`	`59`	`}`
`55`	`60`