Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed is_type_comment() to handle extra spaces in type comments (#2097) #4572

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/black/nodes.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
blib2to3 Node/Leaf transformation-related utility functions.
"""

import re
import sys
from collections.abc import Iterator
from typing import Final, Generic, Literal, Optional, TypeVar, Union
Expand Down Expand Up @@ -926,7 +926,12 @@ def is_type_comment(leaf: Leaf) -> bool:
use `is_type_ignore_comment`). Note that general type comments are no longer
used in modern version of Python, this function may be deprecated in the future."""
t = leaf.type
v = leaf.value
v = leaf.value.strip()

# Normalize spaces
v = re.sub(r"^#\s*", "# ", v) # Ensure one space after #
v = re.sub(r"\s*:\s*", ": ", v) # Ensure one space after :

return t in {token.COMMENT, STANDALONE_COMMENT} and v.startswith("# type:")


Expand Down