source-academy / py-slang / 37093462041

88%

push

github

Fix resolver error carets pointing one column too far right (#484)

* Fix resolver error carets pointing one column too far right

NameNotFoundError, NameReassignmentError and ScopeConflictError padded
their caret line with `col - diff` spaces, treating Token.col as the
token's start column. It is actually the token's end column counted from 1
(contrary to its docstring), so every caret landed one column right of the
name:

    def f(y):
         ^ A name has been reassigned here.

Compute the caret column from the source offsets instead (start minus the
line's start index), in one shared helper, and align the "Perhaps you meant"
line with the message text. Token.col itself is untouched.

Adds tests that check the caret's actual column against the name's position
in the echoed line, and moves the stepper tests' expected messages left by
one space (they had the old, shifted carets baked in).

Fixes #475

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

* Fix ReservedNameError's caret, which broke the build after merging main

#482 added ReservedNameError with the old caret padding and a MAGIC_OFFSET
import, which this PR removes, so the merge with main no longer compiled (CI:
"Cannot find name 'MAGIC_OFFSET'" in errors.ts). Convert it to the shared
underline() helper like the other resolver errors, which also fixes its caret
being one column too far right, and add caret-column tests for it.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>

4976 of 6232 branches covered (79.85%)

Branch coverage included in aggregate %.

12 of 12 new or added lines in 1 file covered. (100.0%)

11140 of 12579 relevant lines covered (88.56%)

169271.34 hits per line