Skip to content

Commit

Permalink
Fix spurious extra spaces after opening parentheses and in default ar…
Browse files Browse the repository at this point in the history 
…guments

Fixes #14
Fixes #17
  • Loading branch information
Lukasz Langa committed Mar 15, 2018
1 parent 4c09ab7 commit fece8ae
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 75 deletions.
113 changes: 38 additions & 75 deletions black.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ def any_open_brackets(self) -> bool:
"""Returns True if there is an yet unmatched open bracket on the line."""
return bool(self.bracket_match)

def max_priority(self, exclude: Iterable[LeafID] = ()) -> int:
def max_priority(self, exclude: Iterable[LeafID] =()) -> int:
"""Returns the highest priority of a delimiter found on the line.
Values are consistent with what `is_delimiter()` returns.
Expand Down Expand Up @@ -781,13 +781,48 @@ def whitespace(leaf: Leaf) -> str:
if t == STANDALONE_COMMENT:
return NO

if t in CLOSING_BRACKETS:
return NO

assert p is not None, f"INTERNAL ERROR: hand-made leaf without parent: {leaf!r}"
prev = leaf.prev_sibling
if not prev:
prevp = preceding_leaf(p)
if not prevp or prevp.type in OPENING_BRACKETS:
return NO

if prevp.type == token.EQUAL:
if prevp.parent and prevp.parent.type in {
syms.typedargslist,
syms.varargslist,
syms.parameters,
syms.arglist,
syms.argument,
}:
return NO

elif prevp.type == token.DOUBLESTAR:
if prevp.parent and prevp.parent.type in {
syms.typedargslist,
syms.varargslist,
syms.parameters,
syms.arglist,
syms.dictsetmaker,
}:
return NO

elif prevp.type == token.COLON:
if prevp.parent and prevp.parent.type == syms.subscript:
return NO

elif prev.type in OPENING_BRACKETS:
return NO

if p.type in {syms.parameters, syms.arglist}:
# untyped function signatures or calls
if t == token.RPAR:
return NO

prev = leaf.prev_sibling
if not prev or prev.type != token.COMMA:
return NO

Expand All @@ -796,13 +831,11 @@ def whitespace(leaf: Leaf) -> str:
if t == token.RPAR:
return NO

prev = leaf.prev_sibling
if prev and prev.type != token.COMMA:
return NO

elif p.type == syms.typedargslist:
# typed function signatures
prev = leaf.prev_sibling
if not prev:
return NO

Expand All @@ -820,7 +853,6 @@ def whitespace(leaf: Leaf) -> str:

elif p.type == syms.tname:
# type names
prev = leaf.prev_sibling
if not prev:
prevp = preceding_leaf(p)
if not prevp or prevp.type != token.COMMA:
Expand All @@ -831,7 +863,6 @@ def whitespace(leaf: Leaf) -> str:
if t == token.LPAR or t == token.RPAR:
return NO

prev = leaf.prev_sibling
if not prev:
if t == token.DOT:
prevp = preceding_leaf(p)
Expand All @@ -849,7 +880,6 @@ def whitespace(leaf: Leaf) -> str:
if t == token.EQUAL:
return NO

prev = leaf.prev_sibling
if not prev:
prevp = preceding_leaf(p)
if not prevp or prevp.type == token.LPAR:
Expand All @@ -863,7 +893,6 @@ def whitespace(leaf: Leaf) -> str:
return NO

elif p.type == syms.dotted_name:
prev = leaf.prev_sibling
if prev:
return NO

Expand All @@ -875,77 +904,16 @@ def whitespace(leaf: Leaf) -> str:
if t == token.LPAR:
return NO

prev = leaf.prev_sibling
if prev and prev.type == token.LPAR:
return NO

elif p.type == syms.subscript:
# indexing
if t == token.COLON:
return NO

prev = leaf.prev_sibling
if not prev or prev.type == token.COLON:
return NO

elif p.type in {
syms.test,
syms.not_test,
syms.xor_expr,
syms.or_test,
syms.and_test,
syms.arith_expr,
syms.expr,
syms.shift_expr,
syms.yield_expr,
syms.term,
syms.power,
syms.comparison,
}:
# various arithmetic and logic expressions
prev = leaf.prev_sibling
if not prev:
prevp = preceding_leaf(p)
if not prevp or prevp.type in OPENING_BRACKETS:
return NO

if prevp.type == token.EQUAL:
if prevp.parent and prevp.parent.type in {
syms.varargslist, syms.parameters, syms.arglist, syms.argument
}:
return NO

return SPACE

elif p.type == syms.atom:
if t in CLOSING_BRACKETS:
return NO

prev = leaf.prev_sibling
if not prev:
prevp = preceding_leaf(p)
if not prevp:
return NO

if prevp.type in OPENING_BRACKETS:
return NO

if prevp.type == token.EQUAL:
if prevp.parent and prevp.parent.type in {
syms.varargslist, syms.parameters, syms.arglist, syms.argument
}:
return NO

if prevp.type == token.DOUBLESTAR:
if prevp.parent and prevp.parent.type in {
syms.varargslist, syms.parameters, syms.arglist, syms.dictsetmaker
}:
return NO

elif prev.type in OPENING_BRACKETS:
return NO

elif t == token.DOT:
if prev and t == token.DOT:
# dots, but not the first one.
return NO

Expand All @@ -955,13 +923,11 @@ def whitespace(leaf: Leaf) -> str:
p.type == syms.subscriptlist
):
# list interior, including unpacking
prev = leaf.prev_sibling
if not prev:
return NO

elif p.type == syms.dictsetmaker:
# dict and set interior, including unpacking
prev = leaf.prev_sibling
if not prev:
return NO

Expand All @@ -970,7 +936,6 @@ def whitespace(leaf: Leaf) -> str:

elif p.type == syms.factor or p.type == syms.star_expr:
# unary ops
prev = leaf.prev_sibling
if not prev:
prevp = preceding_leaf(p)
if not prevp or prevp.type in OPENING_BRACKETS:
Expand All @@ -991,15 +956,13 @@ def whitespace(leaf: Leaf) -> str:

elif p.type == syms.import_from:
if t == token.DOT:
prev = leaf.prev_sibling
if prev and prev.type == token.DOT:
return NO

elif t == token.NAME:
if v == 'import':
return SPACE

prev = leaf.prev_sibling
if prev and prev.type == token.DOT:
return NO

Expand Down
14 changes: 14 additions & 0 deletions tests/function.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ async def coroutine(arg):
)
def function_signature_stress_test(number:int,no_annotation=None,text:str="default",* ,debug:bool=False,**kwargs) -> str:
return text[number:-1]
def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r''):
offset = attr.ib(default=attr.Factory( lambda: _r.uniform(10000, 200000)))
assert task._cancel_stack[:len(old_stack)] == old_stack
def spaces2(result= _core.Value(None)):
...

def long_lines():
if True:
Expand Down Expand Up @@ -103,6 +108,15 @@ def function_signature_stress_test(
return text[number:-1]


def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r''):
offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200000)))
assert task._cancel_stack[:len(old_stack)] == old_stack


def spaces2(result=_core.Value(None)):
...


def long_lines():
if True:
typedargslist.extend(
Expand Down

0 comments on commit fece8ae

Please sign in to comment.