From 5c96bda70a7afb2ce97cbb3cd70c64fc8cb94446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Thu, 12 May 2022 11:43:20 +0200 Subject: 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 --- resources/resource_transformers/tocss/dartsass/transform.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'resources/resource_transformers/tocss') diff --git a/resources/resource_transformers/tocss/dartsass/transform.go b/resources/resource_transformers/tocss/dartsass/transform.go index 082e30710..be4367b2f 100644 --- a/resources/resource_transformers/tocss/dartsass/transform.go +++ b/resources/resource_transformers/tocss/dartsass/transform.go @@ -116,8 +116,13 @@ func (t *transform) Transform(ctx *resources.ResourceTransformationCtx) error { filename = filename[len(stdinPrefix):] } - offsetMatcher := func(m herrors.LineMatcher) bool { - return m.Offset+len(m.Line) >= start.Offset && strings.Contains(m.Line, context) + offsetMatcher := func(m herrors.LineMatcher) int { + if m.Offset+len(m.Line) >= start.Offset && strings.Contains(m.Line, context) { + // We found the line, but return 0 to signal that we want to determine + // the column from the error. + return 0 + } + return -1 } return herrors.NewFileErrorFromFile(sassErr, filename, filename, hugofs.Os, offsetMatcher) -- cgit v1.2.3