Reorder command-line options

[etc/vim.git] / black.py

diff --git a/black.py b/black.py
index ce4a44f392f3daadf1e1f4be88aded372a6c7d96..7587ba82161e2b9ed6f70d9ebc60bf18a1f341e1 100644 (file)
--- a/black.py
+++ b/black.py
@@ -47,7 +47,7 @@ from blib2to3.pgen2.parse import ParseError
 __version__ = "18.5b1"
 DEFAULT_LINE_LENGTH = 88
 DEFAULT_EXCLUDES = (
 __version__ = "18.5b1"
 DEFAULT_LINE_LENGTH = 88
 DEFAULT_EXCLUDES = (

-    r"build/|buck-out/|dist/|_build/|\.git/|\.hg/|\.mypy_cache/|\.tox/|\.venv/"
+    r"/(\.git|\.hg|\.mypy_cache|\.tox|\.venv|_build|buck-out|build|dist)/"

 )
 DEFAULT_INCLUDES = r"\.pyi?$"
 CACHE_DIR = Path(user_cache_dir("black", version=__version__))
 )
 DEFAULT_INCLUDES = r"\.pyi?$"
 CACHE_DIR = Path(user_cache_dir("black", version=__version__))


@@ -143,55 +143,46 @@ class FileMode(Flag):
     show_default=True,
 )
 @click.option(
     show_default=True,
 )
 @click.option(

-    "--check",
+    "--py36",

     is_flag=True,
     help=(
     is_flag=True,
     help=(

-        "Don't write the files back, just return the status.  Return code 0 "
-        "means nothing would change.  Return code 1 means some files would be "
-        "reformatted.  Return code 123 means there was an internal error."
+        "Allow using Python 3.6-only syntax on all input files.  This will put "
+        "trailing commas in function signatures and calls also after *args and "
+        "**kwargs.  [default: per-file auto-detection]"

     ),
 )
 @click.option(
     ),
 )
 @click.option(

-    "--diff",
-    is_flag=True,
-    help="Don't write the files back, just output a diff for each file on stdout.",
-)
-@click.option(
-    "--fast/--safe",
+    "--pyi",

     is_flag=True,
     is_flag=True,

-    help="If --fast given, skip temporary sanity checks. [default: --safe]",
+    help=(
+        "Format all input files like typing stubs regardless of file extension "
+        "(useful when piping source on standard input)."
+    ),

 )
 @click.option(
 )
 @click.option(

-    "-q",
-    "--quiet",
+    "-S",
+    "--skip-string-normalization",

     is_flag=True,
     is_flag=True,

-    help=(
-        "Don't emit non-error messages to stderr. Errors are still emitted, "
-        "silence those with 2>/dev/null."
-    ),
+    help="Don't normalize string quotes or prefixes.",

 )
 @click.option(
 )
 @click.option(

-    "--pyi",
+    "--check",

     is_flag=True,
     help=(
     is_flag=True,
     help=(

-        "Consider all input files typing stubs regardless of file extension "
-        "(useful when piping source on standard input)."
+        "Don't write the files back, just return the status.  Return code 0 "
+        "means nothing would change.  Return code 1 means some files would be "
+        "reformatted.  Return code 123 means there was an internal error."

     ),
 )
 @click.option(
     ),
 )
 @click.option(

-    "--py36",
+    "--diff",

     is_flag=True,
     is_flag=True,

-    help=(
-        "Allow using Python 3.6-only syntax on all input files.  This will put "
-        "trailing commas in function signatures and calls also after *args and "
-        "**kwargs.  [default: per-file auto-detection]"
-    ),
+    help="Don't write the files back, just output a diff for each file on stdout.",

 )
 @click.option(
 )
 @click.option(

-    "-S",
-    "--skip-string-normalization",
+    "--fast/--safe",

     is_flag=True,
     is_flag=True,

-    help="Don't normalize string quotes or prefixes.",
+    help="If --fast given, skip temporary sanity checks. [default: --safe]",

 )
 @click.option(
     "--include",
 )
 @click.option(
     "--include",


@@ -215,6 +206,15 @@ class FileMode(Flag):
     ),
     show_default=True,
 )
     ),
     show_default=True,
 )

+@click.option(
+    "-q",
+    "--quiet",
+    is_flag=True,
+    help=(
+        "Don't emit non-error messages to stderr. Errors are still emitted, "
+        "silence those with 2>/dev/null."
+    ),
+)

 @click.version_option(version=__version__)
 @click.argument(
     "src",
 @click.version_option(version=__version__)
 @click.argument(
     "src",