actions/black
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't crash and burn on empty lines with trailing whitespace

Browse Source 
Fixes #80
This commit is contained in:
Łukasz Langa 2018-03-26 18:41:25 -07:00
parent 611737f9cc
commit fc869039eb
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -333,6 +333,12 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
## Change Log ## Change Log
### 18.3a5 (unreleased)
* fixed 18.3a4 regression: don't crash and burn on empty lines with
trailing whitespace (#80)
### 18.3a4 ### 18.3a4
* `# fmt: off` and `# fmt: on` are implemented (#5) * `# fmt: off` and `# fmt: on` are implemented (#5)

24
blib2to3/pgen2/tokenize.py
View File

@ -430,24 +430,24 @@ def generate_tokens(readline):
yield stashed yield stashed
stashed = None stashed = None
if line[pos] in '\r\n': # skip blank lines
yield (NL, line[pos:], (lnum, pos), (lnum, len(line)), line)
continue
if column > indents[-1]: # count indents if column > indents[-1]: # count indents
indents.append(column) indents.append(column)
yield (INDENT, line[:pos], (lnum, 0), (lnum, pos), line) yield (INDENT, line[:pos], (lnum, 0), (lnum, pos), line)
if line[pos] in '#\r\n': # skip comments or blank lines if line[pos] == '#': # skip comments
if line[pos] == '#': comment_token = line[pos:].rstrip('\r\n')
comment_token = line[pos:].rstrip('\r\n') nl_pos = pos + len(comment_token)
nl_pos = pos + len(comment_token) yield (COMMENT, comment_token,
yield (COMMENT, comment_token, (lnum, pos), (lnum, pos + len(comment_token)), line)
(lnum, pos), (lnum, pos + len(comment_token)), line) yield (NL, line[nl_pos:],
yield (NL, line[nl_pos:], (lnum, nl_pos), (lnum, len(line)), line)
(lnum, nl_pos), (lnum, len(line)), line)
else:
yield ((NL, COMMENT)[line[pos] == '#'], line[pos:],
(lnum, pos), (lnum, len(line)), line)
continue continue
while column < indents[-1]: # count dedents while column < indents[-1]: # count dedents
if column not in indents: if column not in indents:
raise IndentationError( raise IndentationError(
"unindent does not match any outer indentation level", "unindent does not match any outer indentation level",

1
tests/function.py
View File

@ -34,6 +34,7 @@ def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r''
def spaces_types(a: int = 1, b: tuple = (), c: list = [], d: dict = {}, e: bool = True, f: int = -1, g: int = 1 if False else 2, h: str = "", i: str = r''): ... def spaces_types(a: int = 1, b: tuple = (), c: list = [], d: dict = {}, e: bool = True, f: int = -1, g: int = 1 if False else 2, h: str = "", i: str = r''): ...
def spaces2(result= _core.Value(None)): def spaces2(result= _core.Value(None)):
... ...
# EMPTY LINE WITH WHITESPACE (this comment will be removed)
def example(session): def example(session):
result = session.query(models.Customer.id).filter( result = session.query(models.Customer.id).filter(
models.Customer.account_id == account_id, models.Customer.account_id == account_id,

2
tests/test_black.py
View File

@ -17,6 +17,7 @@
fs = partial(black.format_str, line_length=ll) fs = partial(black.format_str, line_length=ll)
THIS_FILE = Path(__file__) THIS_FILE = Path(__file__)
THIS_DIR = THIS_FILE.parent THIS_DIR = THIS_FILE.parent
EMPTY_LINE = '# EMPTY LINE WITH WHITESPACE' + ' (this comment will be removed)'
def dump_to_stderr(*output: str) -> str: def dump_to_stderr(*output: str) -> str:
@ -33,6 +34,7 @@ def read_data(name: str) -> Tuple[str, str]:
lines = test.readlines() lines = test.readlines()
result = _input result = _input
for line in lines: for line in lines:
line = line.replace(EMPTY_LINE, '')
if line.rstrip() == '# output': if line.rstrip() == '# output':
result = _output result = _output
continue continue