Fixes to column number reporting #7078
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
Previously many types didn't have column numbers. This gives correct column number of simple types like `Foo` and `List[Foo]` in Python 3 type annotations. For type comments we cheat a bit and point them to the surrounding statement or definition, which is still a small improvement. For some types we may still be missing column numbers, but this covers the most common cases.
This only affects new semantic analyzer.
ilevkivskyi
approved these changes
Jun 27, 2019
| self.node_stack = [] # type: List[AST] | ||
| self.assume_str_is_unicode = assume_str_is_unicode | ||
|
|
||
| def convert_column(self, column: int) -> int: |
There was a problem hiding this comment.
Add a docstring what is the intended use of this method?
| @@ -3516,6 +3517,7 @@ def analyze_type_application(self, expr: IndexExpr) -> None: | |||
| base = expr.base | |||
| expr.analyzed = TypeApplication(base, types) | |||
| expr.analyzed.line = expr.line | |||
| expr.analyzed.column = expr.column | |||
There was a problem hiding this comment.
There are couple more similar places: process_typevar_declaration() and process_newtype_declaration() not sure if they are important.
test-data/unit/check-classes.test
Outdated
| main:7: error: Type argument "__main__.G[builtins.int]" of "G" must be a subtype of "builtins.str" | ||
| main:7: error: Type argument "builtins.int" of "G" must be a subtype of "builtins.str" |
There was a problem hiding this comment.
Maybe add --show-column-numbers in this test? (IIUC columns caused the change of order.)
|
|
||
| class function: pass | ||
|
|
||
| property = object() # Dummy definition. |
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.
Previously many types and AST nodes didn't have
(good) column numbers. This fixes several such issues.
In particular, this gives correct column number of simple
types like
FooandList[Foo]in Python 3 typeannotations.
For type comments we cheat a bit and point them to the
surrounding statement or definition, which is still a
small improvement.
For some types we may still be missing column numbers,
but this covers the most common cases.