diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-11-01 11:28:30 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-11-01 21:06:35 +0100 |
commit | 1d18eb0574a57c3e9f468659d076a666a3dd76f2 (patch) | |
tree | 8536aa6e8e2fc496b3b2d7b66a2e5f0110e625a6 /hugolib/page_content.go | |
parent | 33a7b36fd42ee31dd79115ec6639bed24247332f (diff) |
Add file (line/col) info to ref/relref errors
See #5371
Diffstat (limited to 'hugolib/page_content.go')
-rw-r--r-- | hugolib/page_content.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/hugolib/page_content.go b/hugolib/page_content.go index b3e8668ef..dc043f824 100644 --- a/hugolib/page_content.go +++ b/hugolib/page_content.go @@ -17,13 +17,12 @@ import ( "bytes" "io" - "github.com/gohugoio/hugo/source" - errors "github.com/pkg/errors" bp "github.com/gohugoio/hugo/bufferpool" "github.com/gohugoio/hugo/common/herrors" + "github.com/gohugoio/hugo/common/text" "github.com/gohugoio/hugo/parser/metadecoders" "github.com/gohugoio/hugo/parser/pageparser" ) @@ -206,13 +205,13 @@ func (p *Page) parseError(err error, input []byte, offset int) error { } -func (p *Page) posFromInput(input []byte, offset int) source.Position { +func (p *Page) posFromInput(input []byte, offset int) text.Position { lf := []byte("\n") input = input[:offset] lineNumber := bytes.Count(input, lf) + 1 endOfLastLine := bytes.LastIndex(input, lf) - return source.Position{ + return text.Position{ Filename: p.pathOrTitle(), LineNumber: lineNumber, ColumnNumber: offset - endOfLastLine, @@ -220,6 +219,6 @@ func (p *Page) posFromInput(input []byte, offset int) source.Position { } } -func (p *Page) posFromPage(offset int) source.Position { +func (p *Page) posFromPage(offset int) text.Position { return p.posFromInput(p.source.parsed.Input(), offset) } |