diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/doc/doc_test.go | 2 | ||||
| -rw-r--r-- | src/cmd/doc/pkg.go | 13 | ||||
| -rw-r--r-- | src/cmd/doc/testdata/pkg.go | 14 |
3 files changed, 17 insertions, 12 deletions
diff --git a/src/cmd/doc/doc_test.go b/src/cmd/doc/doc_test.go index b97cc7688d..b3b0f606cd 100644 --- a/src/cmd/doc/doc_test.go +++ b/src/cmd/doc/doc_test.go @@ -54,6 +54,7 @@ var tests = []test{ `Package comment`, `const ExportedConstant = 1`, // Simple constant. `const ConstOne = 1`, // First entry in constant block. + `const ConstFive ...`, // From block starting with unexported constant. `var ExportedVariable = 1`, // Simple variable. `var VarOne = 1`, // First entry in variable block. `func ExportedFunc\(a int\) bool`, // Function. @@ -73,6 +74,7 @@ var tests = []test{ `Comment before VarOne`, // No comment for first entry in variable block. `ConstTwo = 2`, // No second entry in constant block. `VarTwo = 2`, // No second entry in variable block. + `VarFive = 5`, // From block starting with unexported variable. `type unexportedType`, // No unexported type. `unexportedTypedConstant`, // No unexported typed constant. `Field`, // No fields. diff --git a/src/cmd/doc/pkg.go b/src/cmd/doc/pkg.go index daa22e459d..3e97fd3461 100644 --- a/src/cmd/doc/pkg.go +++ b/src/cmd/doc/pkg.go @@ -257,18 +257,7 @@ func (pkg *Package) packageClause(checkUserPath bool) { // valueSummary prints a one-line summary for each set of values and constants. func (pkg *Package) valueSummary(values []*doc.Value) { for _, value := range values { - // Only print first item in spec, show ... to stand for the rest. - spec := value.Decl.Specs[0].(*ast.ValueSpec) // Must succeed. - exported := true - for _, name := range spec.Names { - if !isExported(name.Name) { - exported = false - break - } - } - if exported { - pkg.oneLineValueGenDecl(value.Decl) - } + pkg.oneLineValueGenDecl(value.Decl) } } diff --git a/src/cmd/doc/testdata/pkg.go b/src/cmd/doc/testdata/pkg.go index ebefb50b2a..0f06651d6b 100644 --- a/src/cmd/doc/testdata/pkg.go +++ b/src/cmd/doc/testdata/pkg.go @@ -21,6 +21,13 @@ const ( constThree = 3 // Comment on line with constThree. ) +// Const block where first entry is unexported. +const ( + constFour = iota + ConstFive + ConstSix +) + // Variables // Comment about exported variable. @@ -37,6 +44,13 @@ var ( varThree = 3 // Comment on line with varThree. ) +// Var block where first entry is unexported. +var ( + varFour = 4 + VarFive = 5 + varSix = 6 +) + // Comment about exported function. func ExportedFunc(a int) bool |