diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-12 11:43:20 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-14 13:40:56 +0200 |
| commit | 5c96bda70a7afb2ce97cbb3cd70c64fc8cb94446 (patch) | |
| tree | 394a557b0dc7db1f6753cf2a09e8cb0577f18442 /markup | |
| parent | 4a96df96d958a8ce122f103c4b417eaba52e6cb1 (diff) | |
errors: Misc improvements
* Redo the server error template
* Always add the content file context if relevant
* Remove some now superflous error string matching
* Move the server error template to _server/error.html
* Add file context (with position) to codeblock render blocks
* Improve JS build errors
Fixes #9892
Fixes #9891
Fixes #9893
Diffstat (limited to 'markup')
| -rw-r--r-- | markup/goldmark/codeblocks/render.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/markup/goldmark/codeblocks/render.go b/markup/goldmark/codeblocks/render.go index fa6d236a1..5ebc2a9ef 100644 --- a/markup/goldmark/codeblocks/render.go +++ b/markup/goldmark/codeblocks/render.go @@ -19,6 +19,7 @@ import ( "sync" "github.com/alecthomas/chroma/lexers" + "github.com/gohugoio/hugo/common/herrors" htext "github.com/gohugoio/hugo/common/text" "github.com/gohugoio/hugo/markup/converter/hooks" "github.com/gohugoio/hugo/markup/goldmark/internal/render" @@ -114,8 +115,8 @@ func (r *htmlRenderer) renderCodeBlock(w util.BufWriter, src []byte, node ast.No } return htext.Position{ Filename: ctx.DocumentContext().Filename, - LineNumber: 0, - ColumnNumber: 0, + LineNumber: 1, + ColumnNumber: 1, } } @@ -128,7 +129,11 @@ func (r *htmlRenderer) renderCodeBlock(w util.BufWriter, src []byte, node ast.No ctx.AddIdentity(cr) - return ast.WalkContinue, err + if err != nil { + return ast.WalkContinue, herrors.NewFileErrorFromPos(cbctx.createPos(), err) + } + + return ast.WalkContinue, nil } type codeBlockContext struct { |