X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/aeaaf571ada7d13a4b52c258b33f1d11b1898a7a..affc0ec3f90803e77fbba62376e7be9b71fe0807:/black.py diff --git a/black.py b/black.py index dbaf14a..e72db2b 100644 --- a/black.py +++ b/black.py @@ -46,7 +46,7 @@ from blib2to3.pgen2 import driver, token from blib2to3.pgen2.parse import ParseError -__version__ = "18.6b0" +__version__ = "18.6b1" DEFAULT_LINE_LENGTH = 88 DEFAULT_EXCLUDES = ( r"/(\.git|\.hg|\.mypy_cache|\.tox|\.venv|_build|buck-out|build|dist)/" @@ -337,7 +337,8 @@ def main( finally: shutdown(loop) if verbose or not quiet: - out("All done!" + ("💥 💔 💥" if report.return_code else " ✨ 🍰 ✨")) + bang = "💥 💔 💥" if report.return_code else "✨ 🍰 ✨" + out(f"All done! {bang}") click.secho(str(report), err=True) ctx.exit(report.return_code) @@ -1834,7 +1835,7 @@ def whitespace(leaf: Leaf, *, complex_subscript: bool) -> str: # noqa C901 elif prevp.type == token.EQUAL and prevp_parent.type == syms.argument: return NO - elif t == token.NAME or t == token.NUMBER: + elif t in {token.NAME, token.NUMBER, token.STRING}: return NO elif p.type == syms.import_from: @@ -2257,7 +2258,7 @@ def right_hand_split( elif head.contains_multiline_strings() or tail.contains_multiline_strings(): raise CannotSplit( "The current optional pair of parentheses is bound to fail to " - "satisfy the splitting algorithm becase the head or the tail " + "satisfy the splitting algorithm because the head or the tail " "contains multiline strings which by definition never fit one " "line." ) @@ -2561,7 +2562,7 @@ def normalize_invisible_parens(node: Node, parens_after: Set[str]) -> None: def maybe_make_parens_invisible_in_atom(node: LN) -> bool: - """If it's safe, make the parens in the atom `node` invisible, recusively.""" + """If it's safe, make the parens in the atom `node` invisible, recursively.""" if ( node.type != syms.atom or is_empty_tuple(node)