diff options
| -rw-r--r-- | commands/server_errors.go | 2 | ||||
| -rw-r--r-- | common/herrors/error_locator.go | 129 | ||||
| -rw-r--r-- | common/herrors/error_locator_test.go | 43 | ||||
| -rw-r--r-- | common/herrors/file_error.go | 53 | ||||
| -rw-r--r-- | common/herrors/file_error_test.go | 8 | ||||
| -rw-r--r-- | common/text/position.go | 99 | ||||
| -rw-r--r-- | common/text/position_test.go | 33 | ||||
| -rw-r--r-- | common/urls/ref.go (renamed from source/position.go) | 25 | ||||
| -rw-r--r-- | go.mod | 1 | ||||
| -rw-r--r-- | go.sum | 2 | ||||
| -rw-r--r-- | hugolib/hugo_sites_build_errors_test.go | 33 | ||||
| -rw-r--r-- | hugolib/page.go | 83 | ||||
| -rw-r--r-- | hugolib/page_content.go | 9 | ||||
| -rw-r--r-- | hugolib/page_ref.go | 100 | ||||
| -rw-r--r-- | hugolib/shortcode.go | 28 | ||||
| -rw-r--r-- | hugolib/shortcode_test.go | 4 | ||||
| -rw-r--r-- | hugolib/site.go | 32 | ||||
| -rw-r--r-- | tpl/template.go | 4 | ||||
| -rw-r--r-- | tpl/tplimpl/embedded/templates.autogen.go | 4 | ||||
| -rw-r--r-- | tpl/tplimpl/embedded/templates/shortcodes/ref.html | 2 | ||||
| -rw-r--r-- | tpl/tplimpl/embedded/templates/shortcodes/relref.html | 2 | ||||
| -rw-r--r-- | tpl/urls/urls.go | 13 |
22 files changed, 412 insertions, 297 deletions
diff --git a/commands/server_errors.go b/commands/server_errors.go index 11f2ab281..6a56a1d19 100644 --- a/commands/server_errors.go +++ b/commands/server_errors.go @@ -72,7 +72,7 @@ var buildErrorTemplate = `<!doctype html> <main> {{ highlight .Error "apl" "noclasses=true,style=monokai" }} {{ with .File }} - {{ $params := printf "noclasses=true,style=monokai,linenos=table,hl_lines=%d,linenostart=%d" (add .Pos 1) (sub .LineNumber .Pos) }} + {{ $params := printf "noclasses=true,style=monokai,linenos=table,hl_lines=%d,linenostart=%d" (add .LinesPos 1) (sub .LineNumber .LinesPos) }} {{ $lexer := .ChromaLexer | default "go-html-template" }} {{ highlight (delimit .Lines "\n") $lexer $params }} {{ end }} diff --git a/common/herrors/error_locator.go b/common/herrors/error_locator.go index 5d3f079be..88cb06c8c 100644 --- a/common/herrors/error_locator.go +++ b/common/herrors/error_locator.go @@ -15,72 +15,21 @@ package herrors import ( - "fmt" "io" "io/ioutil" - "os" "strings" - "github.com/gohugoio/hugo/common/terminal" + "github.com/gohugoio/hugo/common/text" "github.com/gohugoio/hugo/helpers" "github.com/spf13/afero" ) -var fileErrorFormatFunc func(e ErrorContext) string - -func createFileLogFormatter(formatStr string) func(e ErrorContext) string { - - if formatStr == "" { - formatStr = "\":file::line::col\"" - } - - var identifiers = []string{":file", ":line", ":col"} - var identifiersFound []string - - for i := range formatStr { - for _, id := range identifiers { - if strings.HasPrefix(formatStr[i:], id) { - identifiersFound = append(identifiersFound, id) - } - } - } - - replacer := strings.NewReplacer(":file", "%s", ":line", "%d", ":col", "%d") - format := replacer.Replace(formatStr) - - f := func(e ErrorContext) string { - args := make([]interface{}, len(identifiersFound)) - for i, id := range identifiersFound { - switch id { - case ":file": - args[i] = e.Filename - case ":line": - args[i] = e.LineNumber - case ":col": - args[i] = e.ColumnNumber - } - } - - msg := fmt.Sprintf(format, args...) - - if terminal.IsTerminal(os.Stdout) { - return terminal.Notice(msg) - } - - return msg - } - - return f -} - -func init() { - fileErrorFormatFunc = createFileLogFormatter(os.Getenv("HUGO_FILE_LOG_FORMAT")) -} - // LineMatcher contains the elements used to match an error to a line type LineMatcher struct { - FileError FileError + Position text.Position + Error error + LineNumber int Offset int Line string @@ -91,33 +40,34 @@ type LineMatcherFn func(m LineMatcher) bool // SimpleLineMatcher simply matches by line number. var SimpleLineMatcher = func(m LineMatcher) bool { - return m.FileError.LineNumber() == m.LineNumber + return m.Position.LineNumber == m.LineNumber } +var _ text.Positioner = ErrorContext{} + // ErrorContext contains contextual information about an error. This will // typically be the lines surrounding some problem in a file. type ErrorContext struct { - // The source filename. - Filename string // If a match will contain the matched line and up to 2 lines before and after. // Will be empty if no match. Lines []string // The position of the error in the Lines above. 0 based. - Pos int - - // The linenumber in the source file from where the Lines start. Starting at 1. - LineNumber int + LinesPos int - // The column number in the source file. Starting at 1. - ColumnNumber int + position text.Position // The lexer to use for syntax highlighting. // https://gohugo.io/content-management/syntax-highlighting/#list-of-chroma-highlighting-languages ChromaLexer string } +// Position returns the text position of this error. +func (e ErrorContext) Position() text.Position { + return e.position +} + var _ causer = (*ErrorWithFileContext)(nil) // ErrorWithFileContext is an error with some additional file context related @@ -128,7 +78,11 @@ type ErrorWithFileContext struct { } func (e *ErrorWithFileContext) Error() string { - return fileErrorFormatFunc(e.ErrorContext) + ": " + e.cause.Error() + pos := e.Position() + if pos.IsValid() { + return pos.String() + ": " + e.cause.Error() + } + return e.cause.Error() } func (e *ErrorWithFileContext) Cause() error { @@ -163,24 +117,27 @@ func WithFileContext(e error, realFilename string, r io.Reader, matcher LineMatc var errCtx ErrorContext - if le.Offset() != -1 { + posle := le.Position() + + if posle.Offset != -1 { errCtx = locateError(r, le, func(m LineMatcher) bool { - if le.Offset() >= m.Offset && le.Offset() < m.Offset+len(m.Line) { - fe := m.FileError - m.FileError = ToFileErrorWithOffset(fe, -fe.LineNumber()+m.LineNumber) + if posle.Offset >= m.Offset && posle.Offset < m.Offset+len(m.Line) { + lno := posle.LineNumber - m.Position.LineNumber + m.LineNumber + m.Position = text.Position{LineNumber: lno} } return matcher(m) }) - } else { errCtx = locateError(r, le, matcher) } - if errCtx.LineNumber == -1 { + pos := &errCtx.position + + if pos.LineNumber == -1 { return e, false } - errCtx.Filename = realFilename + pos.Filename = realFilename if le.Type() != "" { errCtx.ChromaLexer = chromaLexerFromType(le.Type()) @@ -233,17 +190,20 @@ func locateError(r io.Reader, le FileError, matches LineMatcherFn) ErrorContext panic("must provide an error") } - errCtx := ErrorContext{LineNumber: -1, ColumnNumber: 1, Pos: -1} + errCtx := ErrorContext{position: text.Position{LineNumber: -1, ColumnNumber: 1, Offset: -1}, LinesPos: -1} b, err := ioutil.ReadAll(r) if err != nil { return errCtx } + pos := &errCtx.position + lepos := le.Position() + lines := strings.Split(string(b), "\n") - if le != nil && le.ColumnNumber() >= 0 { - errCtx.ColumnNumber = le.ColumnNumber() + if le != nil && lepos.ColumnNumber >= 0 { + pos.ColumnNumber = lepos.ColumnNumber } lineNo := 0 @@ -252,32 +212,33 @@ func locateError(r io.Reader, le FileError, matches LineMatcherFn) ErrorContext for li, line := range lines { lineNo = li + 1 m := LineMatcher{ - FileError: le, + Position: le.Position(), + Error: le, LineNumber: lineNo, Offset: posBytes, Line: line, } - if errCtx.Pos == -1 && matches(m) { - errCtx.LineNumber = lineNo + if errCtx.LinesPos == -1 && matches(m) { + pos.LineNumber = lineNo break } posBytes += len(line) } - if errCtx.LineNumber != -1 { - low := errCtx.LineNumber - 3 + if pos.LineNumber != -1 { + low := pos.LineNumber - 3 if low < 0 { low = 0 } - if errCtx.LineNumber > 2 { - errCtx.Pos = 2 + if pos.LineNumber > 2 { + errCtx.LinesPos = 2 } else { - errCtx.Pos = errCtx.LineNumber - 1 + errCtx.LinesPos = pos.LineNumber - 1 } - high := errCtx.LineNumber + 2 + high := pos.LineNumber + 2 if high > len(lines) { high = len(lines) } diff --git a/common/herrors/error_locator_test.go b/common/herrors/error_locator_test.go index 84c0faf89..2d007016d 100644 --- a/common/herrors/error_locator_test.go +++ b/common/herrors/error_locator_test.go @@ -21,18 +21,6 @@ import ( "github.com/stretchr/testify/require" ) -func TestCreateFileLogFormatter(t *testing.T) { - assert := require.New(t) - - ctx := ErrorContext{Filename: "/my/file.txt", LineNumber: 12, ColumnNumber: 13} - - assert.Equal("/my/file.txt|13|12", createFileLogFormatter(":file|:col|:line")(ctx)) - assert.Equal("13|/my/file.txt|12", createFileLogFormatter(":col|:file|:line")(ctx)) - assert.Equal("好:13", createFileLogFormatter("好::col")(ctx)) - assert.Equal("\"/my/file.txt:12:13\"", createFileLogFormatter("")(ctx)) - -} - func TestErrorLocator(t *testing.T) { assert := require.New(t) @@ -53,8 +41,9 @@ LINE 8 location := locateErrorInString(lines, lineMatcher) assert.Equal([]string{"LINE 3", "LINE 4", "This is THEONE", "LINE 6", "LINE 7"}, location.Lines) - assert.Equal(5, location.LineNumber) - assert.Equal(2, location.Pos) + pos := location.Position() + assert.Equal(5, pos.LineNumber) + assert.Equal(2, location.LinesPos) assert.Equal([]string{"This is THEONE"}, locateErrorInString(`This is THEONE`, lineMatcher).Lines) @@ -62,32 +51,32 @@ LINE 8 This is THEONE L2 `, lineMatcher) - assert.Equal(2, location.LineNumber) - assert.Equal(1, location.Pos) + assert.Equal(2, location.Position().LineNumber) + assert.Equal(1, location.LinesPos) assert.Equal([]string{"L1", "This is THEONE", "L2", ""}, location.Lines) location = locateErrorInString(`This is THEONE L2 `, lineMatcher) - assert.Equal(0, location.Pos) + assert.Equal(0, location.LinesPos) assert.Equal([]string{"This is THEONE", "L2", ""}, location.Lines) location = locateErrorInString(`L1 This THEONE `, lineMatcher) assert.Equal([]string{"L1", "This THEONE", ""}, location.Lines) - assert.Equal(1, location.Pos) + assert.Equal(1, location.LinesPos) location = locateErrorInString(`L1 L2 This THEONE `, lineMatcher) assert.Equal([]string{"L1", "L2", "This THEONE", ""}, location.Lines) - assert.Equal(2, location.Pos) + assert.Equal(2, location.LinesPos) location = locateErrorInString("NO MATCH", lineMatcher) - assert.Equal(-1, location.LineNumber) - assert.Equal(-1, location.Pos) + assert.Equal(-1, location.Position().LineNumber) + assert.Equal(-1, location.LinesPos) assert.Equal(0, len(location.Lines)) lineMatcher = func(m LineMatcher) bool { @@ -106,8 +95,8 @@ I J`, lineMatcher) assert.Equal([]string{"D", "E", "F", "G", "H"}, location.Lines) - assert.Equal(6, location.LineNumber) - assert.Equal(2, location.Pos) + assert.Equal(6, location.Position().LineNumber) + assert.Equal(2, location.LinesPos) // Test match EOF lineMatcher = func(m LineMatcher) bool { @@ -120,8 +109,8 @@ C `, lineMatcher) assert.Equal([]string{"B", "C", ""}, location.Lines) - assert.Equal(4, location.LineNumber) - assert.Equal(2, location.Pos) + assert.Equal(4, location.Position().LineNumber) + assert.Equal(2, location.LinesPos) offsetMatcher := func(m LineMatcher) bool { return m.Offset == 1 @@ -134,7 +123,7 @@ D E`, offsetMatcher) assert.Equal([]string{"A", "B", "C", "D"}, location.Lines) - assert.Equal(2, location.LineNumber) - assert.Equal(1, location.Pos) + assert.Equal(2, location.Position().LineNumber) + assert.Equal(1, location.LinesPos) } diff --git a/common/herrors/file_error.go b/common/herrors/file_error.go index 49b9f808a..929cc800f 100644 --- a/common/herrors/file_error.go +++ b/common/herrors/file_error.go @@ -16,25 +16,21 @@ package herrors import ( "encoding/json" + "github.com/gohugoio/hugo/common/text" + "github.com/pkg/errors" ) -var _ causer = (*fileError)(nil) +var ( + _ causer = (*fileError)(nil) +) // FileError represents an error when handling a file: Parsing a config file, // execute a template etc. type FileError interface { error - // Offset gets the error location offset in bytes, starting at 0. - // It will return -1 if not provided. - Offset() int - - // LineNumber gets the error location, starting at line 1. - LineNumber() int - - // Column number gets the column location, starting at 1. - ColumnNumber() int + text.Positioner // A string identifying the type of file, e.g. JSON, TOML, markdown etc. Type() string @@ -43,33 +39,16 @@ type FileError interface { var _ FileError = (*fileError)(nil) type fileError struct { - offset int - lineNumber int - columnNumber int - fileType string - - cause error -} + position text.Position -type fileErrorWithLineOffset struct { - FileError - offset int -} - -func (e *fileErrorWithLineOffset) LineNumber() int { - return e.FileError.LineNumber() + e.offset -} + fileType string -func (e *fileError) LineNumber() int { - return e.lineNumber -} - -func (e *fileError) Offset() int { - return e.offset + cause error } -func (e *fileError) ColumnNumber() int { - return e.columnNumber +// Position returns the text position of this error. +func (e fileError) Position() text.Position { + return e.position } func (e *fileError) Type() string { @@ -89,7 +68,8 @@ func (f *fileError) Cause() error { // NewFileError creates a new FileError. func NewFileError(fileType string, offset, lineNumber, columnNumber int, err error) FileError { - return &fileError{cause: err, fileType: fileType, offset: offset, lineNumber: lineNumber, columnNumber: columnNumber} + pos := text.Position{Offset: offset, LineNumber: lineNumber, ColumnNumber: columnNumber} + return &fileError{cause: err, fileType: fileType, position: pos} } // UnwrapFileError tries to unwrap a FileError from err. @@ -111,7 +91,9 @@ func UnwrapFileError(err error) FileError { // ToFileErrorWithOffset will return a new FileError with a line number // with the given offset from the original. func ToFileErrorWithOffset(fe FileError, offset int) FileError { - return &fileErrorWithLineOffset{FileError: fe, offset: offset} + pos := fe.Position() + pos.LineNumber = pos.LineNumber + offset + return &fileError{cause: fe, fileType: fe.Type(), position: pos} } // ToFileError will convert the given error to an error supporting @@ -123,6 +105,7 @@ func ToFileError(fileType string, err error) FileError { if fileType == "" { fileType = typ } + if lno > 0 || offset != -1 { return NewFileError(fileType, offset, lno, col, err) } diff --git a/common/herrors/file_error_test.go b/common/herrors/file_error_test.go index 6acb49603..4108983d3 100644 --- a/common/herrors/file_error_test.go +++ b/common/herrors/file_error_test.go @@ -42,17 +42,15 @@ func TestToLineNumberError(t *testing.T) { } { got := ToFileError("template", test.in) - if test.offset > 0 { - got = ToFileErrorWithOffset(got.(FileError), test.offset) - } errMsg := fmt.Sprintf("[%d][%T]", i, got) le, ok := got.(FileError) assert.True(ok) assert.True(ok, errMsg) - assert.Equal(test.lineNumber, le.LineNumber(), errMsg) - assert.Equal(test.columnNumber, le.ColumnNumber(), errMsg) + pos := le.Position() + assert.Equal(test.lineNumber, pos.LineNumber, errMsg) + assert.Equal(test.columnNumber, pos.ColumnNumber, errMsg) assert.Error(errors.Cause(got)) } diff --git a/common/text/position.go b/common/text/position.go new file mode 100644 index 000000000..0c43c5ae7 --- /dev/null +++ b/common/text/position.go @@ -0,0 +1,99 @@ +// Copyright 2018 The Hugo Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package text + +import ( + "fmt" + "os" + "strings" + + "github.com/gohugoio/hugo/common/terminal" +) + +// Positioner represents a thing that knows its position in a text file or stream, +// typically an error. +type Positioner interface { + Position() Position +} + +// Position holds a source position in a text file or stream. +type Position struct { + Filename string // filename, if any + Offset int // byte offset, starting at 0. It's set to -1 if not provided. + LineNumber int // line number, starting at 1 + ColumnNumber int // column number, starting at 1 (character count per line) +} + +func (pos Position) String() string { + if pos.Filename == "" { + pos.Filename = "<stream>" + } + return positionStringFormatfunc(pos) +} + +// IsValid returns true if line number is > 0. +func (pos Position) IsValid() bool { + return pos.LineNumber > 0 +} + +var positionStringFormatfunc func(p Position) string + +func createPositionStringFormatter(formatStr string) func(p Position) string { + + if formatStr == "" { + formatStr = "\":file::line::col\"" + } + + var identifiers = []string{":file", ":line", ":col"} + var identifiersFound []string + + for i := range formatStr { + for _, id := range identifiers { + if strings.HasPrefix(formatStr[i:], id) { + identifiersFound = append(identifiersFound, id) + } + } + } + + replacer := strings.NewReplacer(":file", "%s", ":line", "%d", ":col", "%d") + format := replacer.Replace(formatStr) + + f := func(pos Position) string { + args := make([]interface{}, len(identifiersFound)) + for i, id := range identifiersFound { + switch id { + case ":file": + args[i] = pos.Filename + case ":line": + args[i] = pos.LineNumber + case ":col": + args[i] = pos.ColumnNumber + } + } + + msg := fmt.Sprintf(format, args...) + + if terminal.IsTerminal(os.Stdout) { + return terminal.Notice(msg) + } + + return msg + } + + return f +} + +func init() { + positionStringFormatfunc = createPositionStringFormatter(os.Getenv("HUGO_FILE_LOG_FORMAT")) +} diff --git a/common/text/position_test.go b/common/text/position_test.go new file mode 100644 index 000000000..a25a3edbd --- /dev/null +++ b/common/text/position_test.go @@ -0,0 +1,33 @@ +// Copyright 2018 The Hugo Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package text + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +func TestPositionStringFormatter(t *testing.T) { + assert := require.New(t) + + pos := Position{Filename: "/my/file.txt", LineNumber: 12, ColumnNumber: 13, Offset: 14} + + assert.Equal("/my/file.txt|13|12", createPositionStringFormatter(":file|:col|:line")(pos)) + assert.Equal("13|/my/file.txt|12", createPositionStringFormatter(":col|:file|:line")(pos)) + assert.Equal("好:13", createPositionStringFormatter("好::col")(pos)) + assert.Equal("\"/my/file.txt:12:13\"", createPositionStringFormatter("")(pos)) + assert.Equal("\"/my/file.txt:12:13\"", pos.String()) + +} diff --git a/source/position.go b/common/urls/ref.go index 8c1ea3d2b..71b00b71d 100644 --- a/source/position.go +++ b/common/urls/ref.go @@ -11,23 +11,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package source - -import "fmt" - -// Position holds a source position. -type Position struct { - Filename string // filename, if any - Offset int // byte offset, starting at 0 - LineNumber int // line number, starting at 1 - ColumnNumber int // column number, starting at 1 (character count per line) -} - -func (pos Position) String() string { - filename := pos.Filename - if filename == "" { - filename = "<stream>" - } - return fmt.Sprintf("%s:%d:%d", filename, pos.LineNumber, pos.ColumnNumber) +package urls +// RefLinker is implemented by those who support reference linking. +// args must contain a path, but can also point to the target +// language or output format. +type RefLinker interface { + Ref(args map[string]interface{}) (string, error) + RelRef(args map[string]interface{}) (string, error) } @@ -12,6 +12,7 @@ require ( github.com/bep/debounce v1.1.0 github.com/bep/gitmap v1.0.0 github.com/bep/go-tocss v0.5.0 + github.com/bep/mapstructure v0.0.0-20180511142126-bb74f1db0675 github.com/chaseadamsio/goorgeous v1.1.0 github.com/cpuguy83/go-md2man v1.0.8 // indirect github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect @@ -20,6 +20,8 @@ github.com/bep/gitmap v1.0.0 h1:cTTZwq7vpGuhwefKCBDV9UrHnZAPVJTvoWobimrqkUc= github.com/bep/gitmap v1.0.0/go.mod h1:g9VRETxFUXNWzMiuxOwcudo6DfZkW9jOsOW0Ft4kYaY= github.com/bep/go-tocss v0.5.0 h1:yDIYy1G9hWi7KVTJjvPPDVZB7gxXRRRiv3ds5mqAaCY= github.com/bep/go-tocss v0.5.0/go.mod h1:c/+hEVoVvkufrV9Is/CPRHWGGdpcTwNuB48hfxzyYBI= +github.com/bep/mapstructure v0.0.0-20180511142126-bb74f1db0675 h1:FsEl9Z/kzas/wM6yhI0AQ0H+hHOL0b5EERNs3N5KYcU= +github.com/bep/mapstructure v0.0.0-20180511142126-bb74f1db0675/go.mod h1:i5WrwxccbJYFpJIcQxfKglzwXT0NE71ElOzBJrO0ODE= github.com/chaseadamsio/goorgeous v1.1.0 h1:J9UrYDhzucUMHXsCKG+kICvpR5dT1cqZdVFTYvSlUBk= github.com/chaseadamsio/goorgeous v1.1.0/go.mod h1:6QaC0vFoKWYDth94dHFNgRT2YkT5FHdQp/Yx15aAAi0= github.com/cpuguy83/go-md2man v1.0.8 h1:DwoNytLphI8hzS2Af4D0dfaEaiSq2bN05mEm4R6vf8M= diff --git a/hugolib/hugo_sites_build_errors_test.go b/hugolib/hugo_sites_build_errors_test.go index 3af596d7c..fce6ec915 100644 --- a/hugolib/hugo_sites_build_errors_test.go +++ b/hugolib/hugo_sites_build_errors_test.go @@ -25,7 +25,7 @@ func (t testSiteBuildErrorAsserter) getFileError(err error) *herrors.ErrorWithFi func (t testSiteBuildErrorAsserter) assertLineNumber(lineNumber int, err error) { fe := t.getFileError(err) - t.assert.Equal(lineNumber, fe.LineNumber, fmt.Sprintf("[%s] got => %s\n%s", t.name, fe, trace())) + t.assert.Equal(lineNumber, fe.Position().LineNumber, fmt.Sprintf("[%s] got => %s\n%s", t.name, fe, trace())) } func (t testSiteBuildErrorAsserter) assertErrorMessage(e1, e2 string) { @@ -42,6 +42,7 @@ func TestSiteBuildErrors(t *testing.T) { const ( yamlcontent = "yamlcontent" tomlcontent = "tomlcontent" + jsoncontent = "jsoncontent" shortcode = "shortcode" base = "base" single = "single" @@ -86,8 +87,8 @@ func TestSiteBuildErrors(t *testing.T) { }, assertCreateError: func(a testSiteBuildErrorAsserter, err error) { fe := a.getFileError(err) - assert.Equal(5, fe.LineNumber) - assert.Equal(1, fe.ColumnNumber) + assert.Equal(5, fe.Position().LineNumber) + assert.Equal(1, fe.Position().ColumnNumber) assert.Equal("go-html-template", fe.ChromaLexer) a.assertErrorMessage("\"layouts/_default/single.html:5:1\": parse failed: template: _default/single.html:5: unexpected \"}\" in operand", fe.Error()) @@ -101,8 +102,8 @@ func TestSite |