]>
git.madduck.net Git - etc/vim.git/blobdiff - black.py
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
report = Report()
try:
if not p.is_file() and str(p) == '-':
report = Report()
try:
if not p.is_file() and str(p) == '-':
- changed = format_stdin_to_stdout(line_length=line_length, fast=fast)
+ changed = format_stdin_to_stdout(
+ line_length=line_length, fast=fast, write_back=not check
+ )
else:
changed = format_file_in_place(
p, line_length=line_length, fast=fast, write_back=not check
else:
changed = format_file_in_place(
p, line_length=line_length, fast=fast, write_back=not check
-def format_stdin_to_stdout(line_length: int, fast: bool) -> bool:
+def format_stdin_to_stdout(
+ line_length: int, fast: bool, write_back: bool = False
+) -> bool:
"""Format file on stdin and pipe output to stdout. Return True if changed."""
contents = sys.stdin.read()
try:
"""Format file on stdin and pipe output to stdout. Return True if changed."""
contents = sys.stdin.read()
try:
- sys.stdout.write(contents)
+ if write_back:
+ sys.stdout.write(contents)
def format_file_contents(
def format_file_contents(
def visit_default(self, node: LN) -> Iterator[Line]:
if isinstance(node, Leaf):
def visit_default(self, node: LN) -> Iterator[Line]:
if isinstance(node, Leaf):
+ any_open_brackets = self.current_line.bracket_tracker.any_open_brackets()
for comment in generate_comments(node):
for comment in generate_comments(node):
- if self.current_line.bracket_tracker.any_open_brackets() :
# any comment within brackets is subject to splitting
self.current_line.append(comment)
elif comment.type == token.COMMENT:
# any comment within brackets is subject to splitting
self.current_line.append(comment)
elif comment.type == token.COMMENT:
# regular standalone comment, to be processed later (see
# docstring in `generate_comments()`
self.standalone_comments.append(comment)
# regular standalone comment, to be processed later (see
# docstring in `generate_comments()`
self.standalone_comments.append(comment)
+ normalize_prefix(node, inside_brackets=any_open_brackets )
if node.type not in WHITESPACE:
for comment in self.standalone_comments:
yield from self.line()
if node.type not in WHITESPACE:
for comment in self.standalone_comments:
yield from self.line()
return DOUBLESPACE
assert p is not None, f"INTERNAL ERROR: hand-made leaf without parent: {leaf!r}"
return DOUBLESPACE
assert p is not None, f"INTERNAL ERROR: hand-made leaf without parent: {leaf!r}"
- if t == token.COLON and p.type != syms.subscript :
+ if t == token.COLON and p.type not in {syms.subscript, syms.subscriptlist} :
return NO
prev = leaf.prev_sibling
return NO
prev = leaf.prev_sibling
return NO
elif prevp.type == token.COLON:
return NO
elif prevp.type == token.COLON:
- if prevp.parent and prevp.parent.type == syms.subscript :
+ if prevp.parent and prevp.parent.type in {syms.subscript, syms.sliceop} :
return NO
elif prevp.parent and prevp.parent.type in {syms.factor, syms.star_expr}:
return NO
elif prevp.parent and prevp.parent.type in {syms.factor, syms.star_expr}:
current_leaves = body_leaves
# Since body is a new indent level, remove spurious leading whitespace.
if body_leaves:
current_leaves = body_leaves
# Since body is a new indent level, remove spurious leading whitespace.
if body_leaves:
- normalize_prefix(body_leaves[0])
+ normalize_prefix(body_leaves[0], inside_brackets=True )
# Build the new lines.
for result, leaves in (
(head, head_leaves), (body, body_leaves), (tail, tail_leaves)
# Build the new lines.
for result, leaves in (
(head, head_leaves), (body, body_leaves), (tail, tail_leaves)
head_leaves.reverse()
# Since body is a new indent level, remove spurious leading whitespace.
if body_leaves:
head_leaves.reverse()
# Since body is a new indent level, remove spurious leading whitespace.
if body_leaves:
- normalize_prefix(body_leaves[0])
+ normalize_prefix(body_leaves[0], inside_brackets=True )
# Build the new lines.
for result, leaves in (
(head, head_leaves), (body, body_leaves), (tail, tail_leaves)
# Build the new lines.
for result, leaves in (
(head, head_leaves), (body, body_leaves), (tail, tail_leaves)
trailing_comma_safe = trailing_comma_safe and py36
leaf_priority = delimiters.get(id(leaf))
if leaf_priority == delimiter_priority:
trailing_comma_safe = trailing_comma_safe and py36
leaf_priority = delimiters.get(id(leaf))
if leaf_priority == delimiter_priority:
- normalize_prefix(current_line.leaves[0])
+ normalize_prefix(current_line.leaves[0], inside_brackets=True )
yield current_line
current_line = Line(depth=line.depth, inside_brackets=line.inside_brackets)
yield current_line
current_line = Line(depth=line.depth, inside_brackets=line.inside_brackets)
and trailing_comma_safe
):
current_line.append(Leaf(token.COMMA, ','))
and trailing_comma_safe
):
current_line.append(Leaf(token.COMMA, ','))
- normalize_prefix(current_line.leaves[0])
+ normalize_prefix(current_line.leaves[0], inside_brackets=True )
-def normalize_prefix(leaf: Leaf) -> None:
- """Leave existing extra newlines for imports. Remove everything else."""
- if is_import(leaf):
+def normalize_prefix(leaf: Leaf, *, inside_brackets: bool) -> None:
+ """Leave existing extra newlines if not `inside_brackets`.
+
+ Remove everything else. Note: don't use backslashes for formatting or
+ you'll lose your voting rights.
+ """
+ if not inside_brackets:
spl = leaf.prefix.split('#', 1)
spl = leaf.prefix.split('#', 1)
- nl_count = spl[0].count('\n')
- leaf.prefix = '\n' * nl_count
- return
+ if '\\' not in spl[0]:
+ nl_count = spl[0].count('\n')
+ leaf.prefix = '\n' * nl_count
+ return
projects / etc / vim.git / blobdiff