pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-07 04:26:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve conflict.

Browse source
This commit is contained in:
Victorsitou 2022-01-18 00:51:12 -03:00
commit eeb25c5e1e
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pre_commit_hooks/.json Normal file
View file

@ -0,0 +1,3 @@
{
"name": "victor"
}

10
pre_commit_hooks/pretty_format_json.py
View file

@ -98,11 +98,11 @@ def main(argv: Sequence[str] | None = None) -> int:
help='Ordered list of keys to keep at the top of JSON hashes', help='Ordered list of keys to keep at the top of JSON hashes',
) )
parser.add_argument( parser.add_argument(
'--no-new-line', '--no-new-line',
action='store_true', action='store_true',
dest='no_new_line', dest='no_new_line',
default=False, default=False,
help="Do NOT add a new line at the end of the files" help='Do NOT add a new line at the end of the files',
) )
parser.add_argument('filenames', nargs='*', help='Filenames to fix') parser.add_argument('filenames', nargs='*', help='Filenames to fix')
args = parser.parse_args(argv) args = parser.parse_args(argv)
@ -116,7 +116,7 @@ def main(argv: Sequence[str] | None = None) -> int:
try: try:
pretty_contents = _get_pretty_format( pretty_contents = _get_pretty_format(
contents, args.indent, ensure_ascii=not args.no_ensure_ascii, contents, args.indent, ensure_ascii=not args.no_ensure_ascii,
sort_keys=not args.no_sort_keys, top_keys=args.top_keys, new_line=not args.no_new_line sort_keys=not args.no_sort_keys, top_keys=args.top_keys, new_line=not args.no_new_line,
) )
except ValueError: except ValueError:
print( print(