diff --git a/cmd/cover/html.go b/cmd/cover/html.go
index e7336e44..864359af 100644
--- a/cmd/cover/html.go
+++ b/cmd/cover/html.go
@@ -6,9 +6,10 @@ package main
import (
"bufio"
+ "bytes"
"fmt"
"go/build"
- "html"
+ "html/template"
"io"
"io/ioutil"
"math"
@@ -36,20 +37,7 @@ func htmlOutput(profile, outfile string) error {
return err
}
- var out *os.File
- if outfile == "" {
- var dir string
- dir, err = ioutil.TempDir("", "cover")
- if err != nil {
- return err
- }
- out, err = os.Create(filepath.Join(dir, "coverage.html"))
- } else {
- out, err = os.Create(outfile)
- }
- if err != nil {
- return err
- }
+ var files []*templateFile
for fn, profile := range profiles {
dir, file := filepath.Split(fn)
@@ -61,14 +49,32 @@ func htmlOutput(profile, outfile string) error {
if err != nil {
return fmt.Errorf("can't read %q: %v", fn, err)
}
- err = htmlGen(out, fn, src, profile.Tokens(src))
+ var buf bytes.Buffer
+ err = htmlGen(&buf, src, profile.Tokens(src))
if err != nil {
- out.Close()
return err
}
+ files = append(files, &templateFile{
+ Name: fn,
+ Body: template.HTML(buf.String()),
+ })
}
- err = out.Close()
+ var out *os.File
+ if outfile == "" {
+ var dir string
+ dir, err = ioutil.TempDir("", "cover")
+ if err != nil {
+ return err
+ }
+ out, err = os.Create(filepath.Join(dir, "coverage.html"))
+ } else {
+ out, err = os.Create(outfile)
+ }
+ err = htmlTemplate.Execute(out, templateData{Files: files})
+ if err == nil {
+ err = out.Close()
+ }
if err != nil {
return err
}
@@ -227,23 +233,17 @@ func (t tokensByPos) Less(i, j int) bool {
// htmlGen generates an HTML coverage report with the provided filename,
// source code, and tokens, and writes it to the given Writer.
-func htmlGen(w io.Writer, filename string, src []byte, tokens []Token) error {
+func htmlGen(w io.Writer, src []byte, tokens []Token) error {
dst := bufio.NewWriter(w)
- fmt.Fprintln(dst, ``)
- fmt.Fprintf(dst, "%s
\n", html.EscapeString(filename))
for i := range src {
for len(tokens) > 0 && tokens[0].Pos == i {
t := tokens[0]
if t.Start {
- c := "rgb(255, 0, 0)" // Red
+ n := 0
if t.Count > 0 {
- // Gradient from pale green (low count)
- // to bright green (high count)
- r := 240 - int(220*t.Norm)
- b := 170 + r/3
- c = fmt.Sprintf("rgb(%v, 255, %v)", r, b)
+ n = int(math.Floor(t.Norm*10)) + 1
}
- fmt.Fprintf(dst, ``, c, t.Count)
+ fmt.Fprintf(dst, ``, n, t.Count)
} else {
dst.WriteString("")
}
@@ -254,13 +254,14 @@ func htmlGen(w io.Writer, filename string, src []byte, tokens []Token) error {
dst.WriteString(">")
case '<':
dst.WriteString("<")
+ case '&':
+ dst.WriteString("&")
case '\t':
dst.WriteString(" ")
default:
dst.WriteByte(b)
}
}
- dst.WriteString("\n")
return dst.Flush()
}
@@ -280,3 +281,74 @@ func startBrowser(url string) bool {
cmd := exec.Command(args[0], append(args[1:], url)...)
return cmd.Start() == nil
}
+
+// rgb returns an rgb value for the specified coverage value
+// between 0 (no coverage) and 11 (max coverage).
+func rgb(n int) string {
+ if n == 0 {
+ return "rgb(255, 0, 0)" // Red
+ }
+ // Gradient from pale green (low count)
+ // to bright green (high count)
+ r := 240 - 22*(n-1)
+ b := 170 + r/3
+ return fmt.Sprintf("rgb(%v, 255, %v)", r, b)
+}
+
+// colors generates the CSS rules for coverage colors.
+func colors() template.CSS {
+ var buf bytes.Buffer
+ for i := 0; i < 12; i++ {
+ fmt.Fprintf(&buf, ".cov%v { color: %v }\n", i, rgb(i))
+ }
+ return template.CSS(buf.String())
+}
+
+var htmlTemplate = template.Must(template.New("html").Funcs(template.FuncMap{
+ "colors": colors,
+}).Parse(tmplHTML))
+
+type templateData struct {
+ Files []*templateFile
+}
+
+type templateFile struct {
+ Name string
+ Body template.HTML
+}
+
+const tmplHTML = `
+
+
+
+
+
+
+
+
+
+ {{range $i, $f := .Files}}
+ {{$f.Body}}
+ {{end}}
+
+
+
+`