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

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot] 2023-08-13 18:07:38 +00:00
parent 496e23dea6
commit 61b72ab2da
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pre_commit_hooks/pretty_format_json.py
View file

@ -2,16 +2,17 @@ from __future__ import annotations
import argparse import argparse
import json import json
import sys
import re import re
import sys
from difflib import unified_diff from difflib import unified_diff
from typing import Mapping from typing import Mapping
from typing import Sequence from typing import Sequence
def _insert_linebreaks(json_str) -> str: def _insert_linebreaks(json_str) -> str:
# (?P<spaces>\s*) seems to capture the \n. Hence, there is no need for it in the substitution string # (?P<spaces>\s*) seems to capture the \n. Hence, there is no need for it in the substitution string
return re.sub(r'\n(?P<spaces>\s*)(?P<json_key>.*): {}(?P<delim>,??)', '\n\g<spaces>\g<json_key>: {\n\g<spaces>}\g<delim>', json_str) return re.sub(r'\n(?P<spaces>\s*)(?P<json_key>.*): {}(?P<delim>,??)', '\n\\g<spaces>\\g<json_key>: {\n\\g<spaces>}\\g<delim>', json_str)
def _get_pretty_format( def _get_pretty_format(
contents: str, contents: str,
@ -126,7 +127,7 @@ def main(argv: Sequence[str] | None = None) -> int:
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, sort_keys=not args.no_sort_keys, top_keys=args.top_keys,
empty_object_with_newline=args.empty_object_with_newline empty_object_with_newline=args.empty_object_with_newline,
) )
except ValueError: except ValueError:
print( print(
@ -145,7 +146,6 @@ def main(argv: Sequence[str] | None = None) -> int:
diff_output = get_diff(contents, pretty_contents, json_file) diff_output = get_diff(contents, pretty_contents, json_file)
sys.stdout.buffer.write(diff_output.encode()) sys.stdout.buffer.write(diff_output.encode())
return status return status

14
tests/pretty_format_json_test.py
View file

@ -1,10 +1,10 @@
from __future__ import annotations from __future__ import annotations
import filecmp
import os import os
import shutil import shutil
import pytest import pytest
import filecmp
from pre_commit_hooks.pretty_format_json import main from pre_commit_hooks.pretty_format_json import main
from pre_commit_hooks.pretty_format_json import parse_num_to_int from pre_commit_hooks.pretty_format_json import parse_num_to_int
@ -142,13 +142,13 @@ def test_diffing_output(capsys):
def test_empty_object_with_newline(tmpdir): def test_empty_object_with_newline(tmpdir):
# same line objects shoud trigger with --empty-object-with-newline switch # same line objects shoud trigger with --empty-object-with-newline switch
sameline = get_resource_path("empty_object_json_sameline.json") sameline = get_resource_path('empty_object_json_sameline.json')
ret = main(["--empty-object-with-newline", str(sameline)]) ret = main(['--empty-object-with-newline', str(sameline)])
assert ret == 1 assert ret == 1
multiline = get_resource_path("empty_object_json_multiline.json") multiline = get_resource_path('empty_object_json_multiline.json')
to_be_formatted_sameline = tmpdir.join( to_be_formatted_sameline = tmpdir.join(
"not_pretty_formatted_empty_object_json_sameline.json" 'not_pretty_formatted_empty_object_json_sameline.json',
) )
shutil.copyfile(str(sameline), str(to_be_formatted_sameline)) shutil.copyfile(str(sameline), str(to_be_formatted_sameline))
@ -158,12 +158,12 @@ def test_empty_object_with_newline(tmpdir):
# now launch the autofix with empty object with newline support on that file # now launch the autofix with empty object with newline support on that file
ret = main( ret = main(
["--autofix", "--empty-object-with-newline", str(to_be_formatted_sameline)] ['--autofix', '--empty-object-with-newline', str(to_be_formatted_sameline)],
) )
# it should have formatted it and don't raise an error code # it should have formatted it and don't raise an error code
assert ret == 0 assert ret == 0
# file was formatted (shouldn't trigger linter with --empty-object-with-newline switch) # file was formatted (shouldn't trigger linter with --empty-object-with-newline switch)
ret = main(["--empty-object-with-newline", str(to_be_formatted_sameline)]) ret = main(['--empty-object-with-newline', str(to_be_formatted_sameline)])
assert ret == 0 assert ret == 0
assert filecmp.cmp(to_be_formatted_sameline, multiline) assert filecmp.cmp(to_be_formatted_sameline, multiline)