ostiwe/go-toml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Parser.Range and subsliceOffset

Browse Source 
Range() existed to recover byte offsets from Highlight subslices.
Now that ParserError carries an explicit Offset field, Range() is
unnecessary. Remove it along with the private subsliceOffset helper
in ast.go.

Tests now use perr.Offset directly and construct Range literals
for Shape() calls.

Co-authored-by: Thomas Pelletier <thomas@pelletier.dev>
This commit is contained in:
Cursor Agent
2026-04-12 19:17:12 +00:00
parent a646ffd9fa
commit 89f970069c
3 changed files with 5 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unstable/parser_test.go
+5 -7
View File
@@ -674,7 +674,7 @@ key3 = "value3"
assert.Equal(t, []string{"key1", "key2", "key3"}, keys)
}
func TestRangeOffsetAfterComment(t *testing.T) {
func TestErrorOffsetAfterComment(t *testing.T) {
input := []byte("# comment\n= \"value\"")
p := Parser{}
@@ -689,12 +689,11 @@ func TestRangeOffsetAfterComment(t *testing.T) {
if !errors.As(err, &perr) {
t.Fatalf("expected ParserError, got %T", err)
}
r := p.Range(perr.Highlight)
shape := p.Shape(r)
if r.Offset != 10 {
t.Errorf("Range offset: got %d, want 10", r.Offset)
if perr.Offset != 10 {
t.Errorf("offset: got %d, want 10", perr.Offset)
}
shape := p.Shape(Range{Offset: uint32(perr.Offset), Length: uint32(len(perr.Highlight))})
if shape.Start.Line != 2 || shape.Start.Column != 1 {
t.Errorf("position: got %d:%d, want 2:1", shape.Start.Line, shape.Start.Column)
}
@@ -753,8 +752,7 @@ func TestErrorHighlightPositions(t *testing.T) {
if !errors.As(err, &perr) {
t.Fatalf("expected ParserError, got %T", err)
}
r := p.Range(perr.Highlight)
shape := p.Shape(r)
shape := p.Shape(Range{Offset: uint32(perr.Offset), Length: uint32(len(perr.Highlight))})
if shape.Start.Line != e.wantLine {
t.Errorf("line: got %d, want %d", shape.Start.Line, e.wantLine)