Skip to content

Commit 93e69bc

Browse files
authored
Merge pull request #800 from zhsj/remove-go4
Remove go4.org dependency
2 parents 083f635 + 78c42f4 commit 93e69bc

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

schema/error.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
package schema
1616

1717
import (
18+
"bufio"
1819
"encoding/json"
1920
"io"
20-
21-
"go4.org/errorutil"
2221
)
2322

2423
// A SyntaxError is a description of a JSON syntax error
@@ -36,7 +35,21 @@ func (e *SyntaxError) Error() string { return e.msg }
3635
// If the given error is not a *json.SyntaxError it is returned unchanged.
3736
func WrapSyntaxError(r io.Reader, err error) error {
3837
if serr, ok := err.(*json.SyntaxError); ok {
39-
line, col, _ := errorutil.HighlightBytePosition(r, serr.Offset)
38+
buf := bufio.NewReader(r)
39+
line := 0
40+
col := 0
41+
for i := int64(0); i < serr.Offset; i++ {
42+
b, berr := buf.ReadByte()
43+
if berr != nil {
44+
break
45+
}
46+
if b == '\n' {
47+
line++
48+
col = 1
49+
} else {
50+
col++
51+
}
52+
}
4053
return &SyntaxError{serr.Error(), line, col, serr.Offset}
4154
}
4255

0 commit comments

Comments
 (0)