Merge pull request #231 from garyburd/master
Improve handling of vendored packages, fix issues
diff --git a/doc/code.go b/doc/code.go
index 41c5481..14d6054 100644
--- a/doc/code.go
+++ b/doc/code.go
@@ -299,13 +299,13 @@
output = e.Output
b.buf = b.buf[:0]
- err := (&printer.Config{Mode: printer.UseSpaces, Tabwidth: 4}).Fprint(
- sliceWriter{&b.buf},
- b.fset,
- &printer.CommentedNode{
- Node: e.Code,
- Comments: e.Comments,
- })
+ var n interface{}
+ if _, ok := e.Code.(*ast.File); ok {
+ n = e.Play
+ } else {
+ n = &printer.CommentedNode{Node: e.Code, Comments: e.Comments}
+ }
+ err := (&printer.Config{Mode: printer.UseSpaces, Tabwidth: 4}).Fprint(sliceWriter{&b.buf}, b.fset, n)
if err != nil {
return Code{Text: err.Error()}, output
}
diff --git a/gddo-server/assets/templates/common.html b/gddo-server/assets/templates/common.html
index 271cd7b..0e2eb71 100644
--- a/gddo-server/assets/templates/common.html
+++ b/gddo-server/assets/templates/common.html
@@ -56,6 +56,11 @@
{{end}}{{end}}
{{define "PkgCmdFooter"}}
+<!-- Bugs -->
+{{with .pdoc}}{{with .Notes}}{{with .BUG}}
+ <h3 id="pkg-note-bug">Bugs <a class="permalink" href="#pkg-note-bug">¶</a></h3>{{range .}}<p>{{$.pdoc.SourceLink .Pos "☞" ""}} {{.Body}}{{end}}
+{{end}}{{end}}{{end}}
+
{{if $.pkgs}}<h3 id="pkg-subdirectories">Directories <a class="permalink" href="#pkg-subdirectories">¶</a></h3>
<table class="table table-condensed">
<thead><tr><th>Path</th><th>Synopsis</th></tr></thead>
diff --git a/gddo-server/assets/templates/pkg.html b/gddo-server/assets/templates/pkg.html
index 7027c8e..aae86a7 100644
--- a/gddo-server/assets/templates/pkg.html
+++ b/gddo-server/assets/templates/pkg.html
@@ -142,11 +142,6 @@
{{template "Examples" .|$.pdoc.ObjExamples}}
{{end}}
{{end}}
-
- <!-- Bugs -->
- {{with .Notes}}{{with .BUG}}
- <h3 id="pkg-note-bug">Bugs <a class="permalink" href="#pkg-note-bug">¶</a></h3>{{range .}}<p>{{$.pdoc.SourceLink .Pos "☞" ""}} {{.Body}}{{end}}
- {{end}}{{end}}
{{template "PkgCmdFooter" $}}
{{if sidebarEnabled}}
