mirror of
https://github.com/pre-commit/pre-commit-hooks.git
synced 2026-04-04 19:26:52 +00:00
adjust error outputs to be more standardized
This commit is contained in:
parent
48c60be15b
commit
b13ff9b868
6 changed files with 22 additions and 13 deletions
|
|
@ -28,13 +28,13 @@ def check_docstring_first(src: bytes, filename: str = '<unknown>') -> int:
|
|||
if tok_type == tokenize.STRING and scol == 0:
|
||||
if found_docstring_line is not None:
|
||||
print(
|
||||
f'{filename}:{sline} Multiple module docstrings '
|
||||
f'{filename}:{sline}: Multiple module docstrings '
|
||||
f'(first docstring on line {found_docstring_line}).',
|
||||
)
|
||||
return 1
|
||||
elif found_code_line is not None:
|
||||
print(
|
||||
f'{filename}:{sline} Module docstring appears after code '
|
||||
f'{filename}:{sline}: Module docstring appears after code '
|
||||
f'(code seen on line {found_code_line}).',
|
||||
)
|
||||
return 1
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ from pre_commit_hooks.util import cmd_output
|
|||
CONFLICT_PATTERNS = [
|
||||
b'<<<<<<< ',
|
||||
b'======= ',
|
||||
b'=======\r\n',
|
||||
b'=======\n',
|
||||
b'>>>>>>> ',
|
||||
]
|
||||
|
|
@ -39,12 +40,12 @@ def main(argv: Sequence[str] | None = None) -> int:
|
|||
retcode = 0
|
||||
for filename in args.filenames:
|
||||
with open(filename, 'rb') as inputfile:
|
||||
for i, line in enumerate(inputfile):
|
||||
for i, line in enumerate(inputfile, start=1):
|
||||
for pattern in CONFLICT_PATTERNS:
|
||||
if line.startswith(pattern):
|
||||
print(
|
||||
f'Merge conflict string "{pattern.decode()}" '
|
||||
f'found in {filename}:{i + 1}',
|
||||
f'{filename}:{i}: Merge conflict string '
|
||||
f'{pattern.strip().decode()!r} found',
|
||||
)
|
||||
retcode = 1
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ def check_file(filename: str) -> int:
|
|||
visitor.visit(ast_obj)
|
||||
|
||||
for bp in visitor.breakpoints:
|
||||
print(f'{filename}:{bp.line}:{bp.col} - {bp.name} {bp.reason}')
|
||||
print(f'{filename}:{bp.line}:{bp.col}: {bp.name} {bp.reason}')
|
||||
|
||||
return int(bool(visitor.breakpoints))
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue