fix parser error highlight offsets for non-suffix slices
Co-authored-by: Thomas Pelletier <thomas@pelletier.dev>
This commit is contained in:
@@ -286,6 +286,27 @@ func TestDecodeError_Position(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDecodeError_InvalidKeyStartAfterComment(t *testing.T) {
|
||||||
|
doc := "# comment\n= \"value\""
|
||||||
|
|
||||||
|
var out map[string]string
|
||||||
|
err := Unmarshal([]byte(doc), &out)
|
||||||
|
assert.Error(t, err)
|
||||||
|
|
||||||
|
var derr *DecodeError
|
||||||
|
if !errors.As(err, &derr) {
|
||||||
|
t.Fatal("error not in expected format")
|
||||||
|
}
|
||||||
|
|
||||||
|
row, col := derr.Position()
|
||||||
|
assert.Equal(t, 2, row)
|
||||||
|
assert.Equal(t, 1, col)
|
||||||
|
assert.Equal(t, "toml: invalid character at start of key: =", derr.Error())
|
||||||
|
assert.Equal(t, `1| # comment
|
||||||
|
2| = "value"
|
||||||
|
| ~ invalid character at start of key: =`, derr.String())
|
||||||
|
}
|
||||||
|
|
||||||
func TestStrictErrorUnwrap(t *testing.T) {
|
func TestStrictErrorUnwrap(t *testing.T) {
|
||||||
fo := bytes.NewBufferString(`
|
fo := bytes.NewBufferString(`
|
||||||
Missing = 1
|
Missing = 1
|
||||||
|
|||||||
+16
-3
@@ -3,6 +3,7 @@ package unstable
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"reflect"
|
||||||
"unicode"
|
"unicode"
|
||||||
|
|
||||||
"github.com/pelletier/go-toml/v2/internal/characters"
|
"github.com/pelletier/go-toml/v2/internal/characters"
|
||||||
@@ -83,10 +84,22 @@ func (p *Parser) rangeOfToken(token, rest []byte) Range {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// subsliceOffset returns the byte offset of subslice b within p.data.
|
// subsliceOffset returns the byte offset of subslice b within p.data.
|
||||||
// b must be a suffix (tail) of p.data.
|
// b must share the same backing array as p.data.
|
||||||
func (p *Parser) subsliceOffset(b []byte) int {
|
func (p *Parser) subsliceOffset(b []byte) int {
|
||||||
// b is a suffix of p.data, so its offset is len(p.data) - len(b)
|
if len(b) == 0 {
|
||||||
return len(p.data) - len(b)
|
// Most callers pass suffix slices, so preserve EOF behavior.
|
||||||
|
return len(p.data)
|
||||||
|
}
|
||||||
|
|
||||||
|
dataPtr := reflect.ValueOf(p.data).Pointer()
|
||||||
|
subPtr := reflect.ValueOf(b).Pointer()
|
||||||
|
|
||||||
|
offset := int(subPtr - dataPtr)
|
||||||
|
if offset < 0 || offset+len(b) > len(p.data) {
|
||||||
|
panic("subslice is not within parser input")
|
||||||
|
}
|
||||||
|
|
||||||
|
return offset
|
||||||
}
|
}
|
||||||
|
|
||||||
// Raw returns the slice corresponding to the bytes in the given range.
|
// Raw returns the slice corresponding to the bytes in the given range.
|
||||||
|
|||||||
Reference in New Issue
Block a user