1
0
mirror of https://github.com/golang/go synced 2024-11-18 10:54:40 -07:00

go.tools: Expose filename rather than extension only, needed for new tour.

R=adg, r
CC=golang-codereviews
https://golang.org/cl/43470050
This commit is contained in:
Francesc Campoy 2014-01-02 16:03:56 -08:00
parent 8c66e887f7
commit 53273c1d55

View File

@ -29,10 +29,11 @@ func init() {
} }
type Code struct { type Code struct {
Text template.HTML Text template.HTML
Play bool // runnable code Play bool // runnable code
Ext string // file extension FileName string // file name
Raw []byte // content of the file Ext string // file extension
Raw []byte // content of the file
} }
func (c Code) TemplateName() string { return "code" } func (c Code) TemplateName() string { return "code" }
@ -128,10 +129,11 @@ func parseCode(ctx *Context, sourceFile string, sourceLine int, cmd string) (Ele
return nil, err return nil, err
} }
return Code{ return Code{
Text: template.HTML(buf.String()), Text: template.HTML(buf.String()),
Play: play, Play: play,
Ext: filepath.Ext(filename), FileName: filepath.Base(filename),
Raw: textBytes, Ext: filepath.Ext(filename),
Raw: textBytes,
}, nil }, nil
} }