VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

another parser issue, very much related to the last one. sometimes a None element was used as a token.fixes #418

Browse Source
This commit is contained in:
Dave Halter
2014-07-18 15:10:10 +02:00
parent 0dea47b260
commit 21341283ca
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/parser/representation.py
View File

@@ -1073,7 +1073,8 @@ isinstance(c, (tokenize.Token, Operator)) else unicode(c)
end_pos = end_pos[0], end_pos[1] - 1 end_pos = end_pos[0], end_pos[1] - 1
break break
token_list.append(tok) if tok is not None: # Can be None, because of lambda/for.
token_list.append(tok)
if not token_list: if not token_list:
return None, tok return None, tok

6
test/test_parser/test_parser.py
View File

@@ -119,3 +119,9 @@ def test_carriage_return_statements():
source = source.replace('\n', '\r\n') source = source.replace('\n', '\r\n')
stmt = Parser(source).module.statements[0] stmt = Parser(source).module.statements[0]
assert '#' not in stmt.get_code() assert '#' not in stmt.get_code()
def test_incomplete_list_comprehension():
""" Shouldn't raise an error, same bug as #418. """
s = Parser(u('(1 for def')).module.statements[0]
assert s.expression_list()