Merge pull request #10 from scorredoira/master

benbjohnson · benbjohnson · commit 3808c9ae4d24 · 2015-03-10T10:13:05.000-06:00
Allow subfolders in preprocessor line directives.
diff --git a/template.go b/template.go
@@ -9,7 +9,6 @@ import (
 	"go/token"
 	"io"
 	"os"
-	"path/filepath"
 )
 
 // Template represents an entire Ego template.
@@ -178,7 +177,7 @@ type Pos struct {
 
 func (p *Pos) write(buf *bytes.Buffer) {
 	if p != nil && p.Path != "" && p.LineNo > 0 {
-		fmt.Fprintf(buf, "//line %s:%d\n", filepath.Base(p.Path), p.LineNo)
+		fmt.Fprintf(buf, "//line %s:%d\n", p.Path, p.LineNo)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ import (`
`9`	`9`	`"go/token"`
`10`	`10`	`"io"`
`11`	`11`	`"os"`
`12`		`- "path/filepath"`
`13`	`12`	`)`
`14`	`13`
`15`	`14`	`// Template represents an entire Ego template.`
`@@ -178,7 +177,7 @@ type Pos struct {`
`178`	`177`
`179`	`178`	`func (p Pos) write(buf bytes.Buffer) {`
`180`	`179`	`if p != nil && p.Path != "" && p.LineNo > 0 {`
`181`		`- fmt.Fprintf(buf, "//line %s:%d\n", filepath.Base(p.Path), p.LineNo)`
	`180`	`+ fmt.Fprintf(buf, "//line %s:%d\n", p.Path, p.LineNo)`
`182`	`181`	`}`
`183`	`182`	`}`
`184`	`183`