Skip to content

fix: error message for discard #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ianlewis merged 1 commit into from
Jan 26, 2026
Merged

fix: error message for discard #183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions custom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,12 +337,14 @@ func (l *CustomLexer) advance(numRunes int, discard bool) int {
toRead = numRunes
}
}

// Peek at input so we can increment position, line, column counters.
peekedRunes, err := l.r.Peek(toRead)
if err != nil && !errors.Is(err, io.EOF) {
l.setErr(fmt.Errorf("peeking input: %w", err))
peekedRunes, peekErr := l.r.Peek(toRead)
if peekErr != nil && !errors.Is(peekErr, io.EOF) {
l.setErr(fmt.Errorf("peeking input: %w", peekErr))
return advanced
}

// Advance by peeked amount.
numDiscarded, dErr := l.r.Discard(len(peekedRunes))
advanced += numDiscarded
Expand All @@ -365,13 +367,12 @@ func (l *CustomLexer) advance(numRunes int, discard bool) int {
}

if dErr != nil {
l.setErr(fmt.Errorf("discarding input: %w", err))
l.setErr(fmt.Errorf("discarding input: %w", dErr))
return advanced
}

if err != nil {
if peekErr != nil {
// EOF from Peek
l.setErr(err)
return advanced
}

Expand Down