mirror of
https://github.com/gohugoio/hugo.git
synced 2024-06-30 18:39:48 +00:00
a3701e0931
We have been using `go-toml` for language files only. This commit makes it the only TOML library. It's spec compliant and very fast. A benchark building a site with 200 pages with TOML front matter: ```bash name old time/op new time/op delta SiteNew/Regular_TOML_front_matter-16 48.5ms ± 1% 47.1ms ± 1% -2.85% (p=0.029 n=4+4) name old alloc/op new alloc/op delta SiteNew/Regular_TOML_front_matter-16 16.9MB ± 0% 16.7MB ± 0% -1.56% (p=0.029 n=4+4) name old allocs/op new allocs/op delta SiteNew/Regular_TOML_front_matter-16 302k ± 0% 296k ± 0% -2.20% (p=0.029 n=4+4) ``` Note that the front matter unmarshaling is only a small part of building a site, so the above is very good. Fixes #8801
78 lines
1.8 KiB
Go
78 lines
1.8 KiB
Go
// 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 herrors
|
|
|
|
import (
|
|
"regexp"
|
|
"strconv"
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
"github.com/pelletier/go-toml/v2"
|
|
)
|
|
|
|
var lineNumberExtractors = []lineNumberExtractor{
|
|
// Template/shortcode parse errors
|
|
newLineNumberErrHandlerFromRegexp(".*:(\\d+):(\\d*):"),
|
|
newLineNumberErrHandlerFromRegexp(".*:(\\d+):"),
|
|
|
|
// TOML parse errors
|
|
tomlLineNumberExtractor,
|
|
// YAML parse errors
|
|
newLineNumberErrHandlerFromRegexp("line (\\d+):"),
|
|
|
|
// i18n bundle errors
|
|
newLineNumberErrHandlerFromRegexp("\\((\\d+),\\s(\\d*)"),
|
|
}
|
|
|
|
type lineNumberExtractor func(e error) (int, int)
|
|
|
|
var tomlLineNumberExtractor = func(e error) (int, int) {
|
|
e = errors.Cause(e)
|
|
if terr, ok := e.(*toml.DecodeError); ok {
|
|
return terr.Position()
|
|
}
|
|
return -1, -1
|
|
}
|
|
|
|
func newLineNumberErrHandlerFromRegexp(expression string) lineNumberExtractor {
|
|
re := regexp.MustCompile(expression)
|
|
return extractLineNo(re)
|
|
}
|
|
|
|
func extractLineNo(re *regexp.Regexp) lineNumberExtractor {
|
|
return func(e error) (int, int) {
|
|
if e == nil {
|
|
panic("no error")
|
|
}
|
|
col := 1
|
|
s := e.Error()
|
|
m := re.FindStringSubmatch(s)
|
|
if len(m) >= 2 {
|
|
lno, _ := strconv.Atoi(m[1])
|
|
if len(m) > 2 {
|
|
col, _ = strconv.Atoi(m[2])
|
|
}
|
|
|
|
if col <= 0 {
|
|
col = 1
|
|
}
|
|
|
|
return lno, col
|
|
}
|
|
|
|
return -1, col
|
|
}
|
|
}
|