actions/black
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more in linegen.py

Browse Source
This commit is contained in:
Jelle Zijlstra 2022-12-10 08:41:19 -08:00
parent 9a686767c9
commit 00cd37169d
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/black/linegen.py
View File

@ -330,24 +330,17 @@ def visit_STRING(self, leaf: Leaf) -> Iterator[Line]:
if is_docstring(leaf) and "\\\n" not in leaf.value: if is_docstring(leaf) and "\\\n" not in leaf.value:
# We're ignoring docstrings with backslash newline escapes because changing # We're ignoring docstrings with backslash newline escapes because changing
# indentation of those changes the AST representation of the code. # indentation of those changes the AST representation of the code.
if Preview.normalize_docstring_quotes_and_prefixes_properly in self.mode: if self.mode.string_normalization:
# There was a bug where --skip-string-normalization wouldn't stop us
# from normalizing docstring prefixes. To maintain stability, we can
# only address this buggy behaviour while the preview style is enabled.
if self.mode.string_normalization:
docstring = normalize_string_prefix(leaf.value)
# visit_default() does handle string normalization for us, but
# since this method acts differently depending on quote style (ex.
# see padding logic below), there's a possibility for unstable
# formatting as visit_default() is called *after*. To avoid a
# situation where this function formats a docstring differently on
# the second pass, normalize it early.
docstring = normalize_string_quotes(docstring)
else:
docstring = leaf.value
else:
# ... otherwise, we'll keep the buggy behaviour >.<
docstring = normalize_string_prefix(leaf.value) docstring = normalize_string_prefix(leaf.value)
# visit_default() does handle string normalization for us, but
# since this method acts differently depending on quote style (ex.
# see padding logic below), there's a possibility for unstable
# formatting as visit_default() is called *after*. To avoid a
# situation where this function formats a docstring differently on
# the second pass, normalize it early.
docstring = normalize_string_quotes(docstring)
else:
docstring = leaf.value
prefix = get_string_prefix(docstring) prefix = get_string_prefix(docstring)
docstring = docstring[len(prefix) :] # Remove the prefix docstring = docstring[len(prefix) :] # Remove the prefix
quote_char = docstring[0] quote_char = docstring[0]
@ -425,14 +418,8 @@ def __post_init__(self) -> None:
self.visit_try_stmt = partial( self.visit_try_stmt = partial(
v, keywords={"try", "except", "else", "finally"}, parens=Ø v, keywords={"try", "except", "else", "finally"}, parens=Ø
) )
if self.mode.preview: self.visit_except_clause = partial(v, keywords={"except"}, parens={"except"})
self.visit_except_clause = partial( self.visit_with_stmt = partial(v, keywords={"with"}, parens={"with"})
v, keywords={"except"}, parens={"except"}
)
self.visit_with_stmt = partial(v, keywords={"with"}, parens={"with"})
else:
self.visit_except_clause = partial(v, keywords={"except"}, parens=Ø)
self.visit_with_stmt = partial(v, keywords={"with"}, parens=Ø)
self.visit_classdef = partial(v, keywords={"class"}, parens=Ø) self.visit_classdef = partial(v, keywords={"class"}, parens=Ø)
self.visit_expr_stmt = partial(v, keywords=Ø, parens=ASSIGNMENTS) self.visit_expr_stmt = partial(v, keywords=Ø, parens=ASSIGNMENTS)
self.visit_return_stmt = partial(v, keywords={"return"}, parens={"return"}) self.visit_return_stmt = partial(v, keywords={"return"}, parens={"return"})