mirror of
https://github.com/PyCQA/flake8.git
synced 2026-03-29 18:46:52 +00:00
Handle SyntaxErrors after new-lines specially
In some cases, when we handle SyntaxErrors we need to ensure that the column number is correct for a 1-indexed report. In some cases, we also need to account for the fact that the SyntaxError has happened "after" a new-line. To extract and alter the row and column numbers, we've moved the logic to a private static method on the FileChecker object to avoid an overly complex method. Closes #237
This commit is contained in:
parent
c17043ff3f
commit
7998734fe6
3 changed files with 61 additions and 8 deletions
|
|
@ -456,20 +456,47 @@ class FileChecker(object):
|
|||
)
|
||||
return plugin['plugin'](**arguments)
|
||||
|
||||
@staticmethod
|
||||
def _extract_syntax_information(exception):
|
||||
token = ()
|
||||
if len(exception.args) > 1:
|
||||
token = exception.args[1]
|
||||
if len(token) > 2:
|
||||
row, column = token[1:3]
|
||||
else:
|
||||
row, column = (1, 0)
|
||||
|
||||
if column > 0 and token and isinstance(exception, SyntaxError):
|
||||
# NOTE(sigmavirus24): SyntaxErrors report 1-indexed column
|
||||
# numbers. We need to decrement the column number by 1 at
|
||||
# least.
|
||||
offset = 1
|
||||
physical_line = token[-1]
|
||||
if len(physical_line) == column and physical_line[-1] == '\n':
|
||||
# NOTE(sigmavirus24): By default, we increment the column
|
||||
# value so that it's always 1-indexed. The SyntaxError that
|
||||
# we are trying to handle here will end up being 2 past
|
||||
# the end of the line. This happens because the
|
||||
# SyntaxError is technically the character after the
|
||||
# new-line. For example, if the code is ``foo(\n`` then
|
||||
# ``\n`` will be 4, the empty string will be 5 but most
|
||||
# tools want to report the at column 4, i.e., the opening
|
||||
# parenthesis. Semantically, having a column number of 6 is
|
||||
# correct but not useful for tooling (e.g., editors that
|
||||
# constantly run Flake8 for users).
|
||||
# See also: https://gitlab.com/pycqa/flake8/issues/237
|
||||
offset += 1
|
||||
column -= offset
|
||||
return row, column
|
||||
|
||||
def run_ast_checks(self):
|
||||
"""Run all checks expecting an abstract syntax tree."""
|
||||
try:
|
||||
ast = self.processor.build_ast()
|
||||
except (ValueError, SyntaxError, TypeError):
|
||||
(exc_type, exception) = sys.exc_info()[:2]
|
||||
if len(exception.args) > 1:
|
||||
offset = exception.args[1]
|
||||
if len(offset) > 2:
|
||||
offset = offset[1:3]
|
||||
else:
|
||||
offset = (1, 0)
|
||||
|
||||
self.report('E999', offset[0], offset[1], '%s: %s' %
|
||||
row, column = self._extract_syntax_information(exception)
|
||||
self.report('E999', row, column, '%s: %s' %
|
||||
(exc_type.__name__, exception.args[0]))
|
||||
return
|
||||
|
||||
|
|
|
|||
1
tests/fixtures/example-code/invalid-syntax.py
vendored
Normal file
1
tests/fixtures/example-code/invalid-syntax.py
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
foo(
|
||||
25
tests/unit/test_file_checker.py
Normal file
25
tests/unit/test_file_checker.py
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
"""Unit tests for the FileChecker class."""
|
||||
import mock
|
||||
|
||||
from flake8 import checker
|
||||
|
||||
|
||||
@mock.patch('flake8.processor.FileProcessor')
|
||||
def test_run_ast_checks_handles_SyntaxErrors(FileProcessor):
|
||||
"""Stress our SyntaxError handling.
|
||||
|
||||
Related to: https://gitlab.com/pycqa/flake8/issues/237
|
||||
"""
|
||||
processor = mock.Mock(lines=[])
|
||||
FileProcessor.return_value = processor
|
||||
processor.build_ast.side_effect = SyntaxError('Failed to build ast',
|
||||
('', 1, 5, 'foo(\n'))
|
||||
file_checker = checker.FileChecker(__file__, checks={}, options=object())
|
||||
|
||||
with mock.patch.object(file_checker, 'report') as report:
|
||||
file_checker.run_ast_checks()
|
||||
|
||||
report.assert_called_once_with(
|
||||
'E999', 1, 3,
|
||||
'SyntaxError: Failed to build ast',
|
||||
)
|
||||
Loading…
Add table
Add a link
Reference in a new issue