Fix error in end_{line,col} tracking #100
Merged
Conversation
This file contains 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
The current implementation sets the end line and column of a node to the end values for the next token after visiting that node. However, since visiting a node consumes all of its tokens, this sets them to the end of the first token outside the node. This makes it seem like the node contains the token after it. For example, in the test added in this commit for "a = b + c", the current implementation has a's end_col as 3 and b's as 7, which means a contains the "=" and b contains the "+". This commit fixes the issue by setting the end values to the start values for the next token.
|
Friendly ping @soupytwist |
soupytwist
reviewed
Feb 11, 2022
pasta/base/annotate_test.py
Outdated
|
|
||
| self.assertEqual(2, fmt.get(a, 'end_col')) | ||
| self.assertEqual(6, fmt.get(b, 'end_col')) | ||
| self.assertEqual(9, fmt.get(c, 'end_col')) |
There was a problem hiding this comment.
This doesn't work in python2.7, which (tbh) isn't that big a deal, but pasta still supports it.
2.7:
"a + b"
NAME 'a' (1, 0), (1, 1)
OP '+' (1, 2), (1, 3)
NAME 'b' (1, 4), (1, 5)
ENDMARKER '' (2, 0), (2, 0)
3.9
"a + b"
NAME 'a' (1, 0), (1, 1)
OP '+' (1, 2), (1, 3)
NAME 'b' (1, 4), (1, 5)
NEWLINE '' (1, 5), (1, 6)
ENDMARKER '' (2, 0), (2, 0)
I'm not going to insist on reworking a bunch of token nonsense to get this to work, so proposing this instead:
# NB: 0 to support python2.7 which does not generate a NEWLINE token
self.assertIn(fmt.get(c, 'end_col'), (9, 0))
There was a problem hiding this comment.
Thanks for finding that and suggesting the fix!
Fix suggested by @soupytwist.
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The current implementation sets the end line and column of a node to the end values for the next token after visiting that node. However, since visiting a node consumes all of its tokens, this sets them to the end of the first token outside the node. This makes it seem like the node contains the token after it.
For example, in the test added in this commit for "a = b + c", the current implementation has a's end_col as 3 and b's as 7, which means a contains the "=" and b contains the "+".
This commit fixes the issue by setting the end values to the start values for the next token.