Fix crash on type comment with trailing space #3773
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
src/black/parsing.py
Outdated
| normalized = _normalize("\n", value) | ||
| elif field == "type_comment" and isinstance(value, str): | ||
| # Trailing spaces in type comments are removed. |
There was a problem hiding this comment.
Interesting that we apparently do not remove trailing tabs, only spaces. That might be a bug?
In any case, this change looks good, thanks!
There was a problem hiding this comment.
Oh, we do remove tabs. Sorry, I forgot those exist.
There was a problem hiding this comment.
To be clear we actually don't strip trailing tabs:
(py311) jelle@m2mb-jelle black % black -c "x = int # type: int\t"
x = int # type: int\t
(py311) jelle@m2mb-jelle black % black -c "x = int # type: int "
x = int # type: int
error: cannot format <string>: INTERNAL ERROR: Black produced code that is not equivalent to the source. Please report a bug on https://github.com/psf/black/issues. This diff might be helpful: /var/folders/hh/hdb5qd2x3v51v6l0gknpfjfr0000gp/T/blk_7xu6fnsp.log
There was a problem hiding this comment.
Oh wait, that's not actually a tab, is it? Just a \t in the comment.
There was a problem hiding this comment.
Yeah, that's not a tab. black -c $'x = int # type: int\t'
JelleZijlstra
approved these changes
Jul 9, 2023
|
diff-shades reports zero changes comparing this PR (68afae7) to main (2593af2).%0A%0A---%0A%0AWhat is this? | Workflow run | diff-shades documentation |
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.
Fixes #3496