{{ message }}
Use nested subscript line numbers in fastparse#21500
Open
Sean-Kenneth-Doherty wants to merge 3 commits into
Open
Use nested subscript line numbers in fastparse#21500Sean-Kenneth-Doherty wants to merge 3 commits into
Sean-Kenneth-Doherty wants to merge 3 commits into
Conversation
This comment has been minimized.
This comment has been minimized.
Author
Author
|
I pushed follow-up commit The follow-up keeps normal source annotations at offset 0 and passes Fresh local validation on the updated head:
The refreshed GitHub Actions matrix is running now. |
Author
|
Follow-up after the first CI run exposed line-number regressions in synthetic type parses:
The refreshed GitHub Actions matrix is still running on the current head ( |
Contributor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #21480
When fastparse converts a type annotation subscript into an
UnboundType, it used the outer annotation line captured whenTypeConverterwas created. For nested multi-line subscripts, that made wrong-arity errors point at the outer annotation instead of the nested offending subscript.Use the AST subscript node's own line number for real source annotations while preserving source offsets for annotations parsed out of type comments. This matches the native parser behavior for nested annotations without collapsing type-comment errors to line 1.
Verification:
PATH=.venv/bin:$PATH .venv/bin/python runtests.py testNestedSubscriptWrongArityLineNumber testClassVarTooManyArguments testInvalidNumberOfGenericArgsInTypeDeclPATH=.venv/bin:$PATH .venv/bin/python runtests.py testInvalidNumberOfGenericArgsInUndefinedArg testInvalidNumberOfGenericArgsInNestedBlock testInvalidNumberOfGenericArgsInTupleType testInvalidNumberOfGenericArgsInFunctionType testInvalidFunctionType testInvalidOptionalType testClassVarInClassVarPATH=.venv/bin:$PATH .venv/bin/python runtests.py testPreviousErrorInMethodSemanalPass3PATH=.venv/bin:$PATH .venv/bin/python runtests.py testTypeCommentNestedSubscriptWrongArityLineNumber testNestedSubscriptWrongArityLineNumber testClassVarTooManyArgumentspython3.11andpython3.12: nested source annotations report line 3 while parsed type comments report relative line 1TMPDIR=/home/sean/.cache/codex-tmp/go-build GOTMPDIR=/home/sean/.cache/codex-tmp/go-build PATH=.venv/bin:$PATH .venv/bin/pre-commit run --files mypy/fastparse.py test-data/unit/check-errorcodes.test.venv/bin/python -m compileall -q mypy/fastparse.pyTMPDIR=/home/sean/.cache/codex-tmp/go-build GOTMPDIR=/home/sean/.cache/codex-tmp/go-build PATH=.venv/bin:$PATH .venv/bin/python -m mypy --config-file mypy_self_check.ini --no-incremental mypy/fastparse.pyNote: the full local self-check over
-p mypy -p mypycwas attempted but did not complete in a useful time locally after a long silent low-CPU run, so I replaced it with the narrower parser-file self-check plus the failing fixture coverage above.