postcss: Fix line numbers in error messages

Fixes #9880
This commit is contained in:
Bjørn Erik Pedersen
2022-05-12 10:09:15 +02:00
parent 2fbdee7268
commit e8537e6dd0
2 changed files with 63 additions and 51 deletions

View File

@@ -28,6 +28,7 @@ import (
"github.com/gohugoio/hugo/common/collections"
"github.com/gohugoio/hugo/common/hexec"
"github.com/gohugoio/hugo/hugofs"
"github.com/gohugoio/hugo/common/hugo"
@@ -39,8 +40,6 @@ import (
"errors"
"github.com/gohugoio/hugo/hugofs"
"github.com/mitchellh/mapstructure"
"github.com/gohugoio/hugo/common/herrors"
@@ -391,8 +390,19 @@ func (imp *importResolver) toFileError(output string) error {
return inErr
}
realFilename := fi.(hugofs.FileMetaInfo).Meta().Filename
meta := fi.(hugofs.FileMetaInfo).Meta()
realFilename := meta.Filename
f, err := meta.Open()
if err != nil {
return inErr
}
defer f.Close()
return herrors.NewFileErrorFromFile(inErr, file.Filename, realFilename, hugofs.Os, herrors.SimpleLineMatcher)
ferr := herrors.NewFileError(realFilename, inErr)
pos := ferr.Position()
pos.LineNumber = file.Offset + 1
return ferr.UpdatePosition(pos).UpdateContent(f, nil)
//return herrors.NewFileErrorFromFile(inErr, file.Filename, realFilename, hugofs.Os, herrors.SimpleLineMatcher)
}