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

Make statement_elements_in_statement work with ListComprehensions, Lambdas and 'except foo as' expressions

Browse Source
This commit is contained in:
Dave Halter
2014-09-02 14:52:04 +02:00
parent 38c71fce3f
commit ea5b98905e
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jedi/evaluate/helpers.py
View File

@@ -240,9 +240,22 @@ def statement_elements_in_statement(stmt):
stmt_el = stmt_el.next
stmt_els = []
for item in stmt.expression_list():
for as_name in stmt.as_names:
# TODO This creates a custom pr.Call, we shouldn't do that.
stmt_els.append(pr.Call(as_name._sub_module, as_name,
as_name.start_pos, as_name.end_pos))
ass_items = chain.from_iterable(items for items, op in stmt.assignment_details)
for item in stmt.expression_list() + list(ass_items):
if isinstance(item, pr.StatementElement):
search_stmt_el(item, stmt_els)
elif isinstance(item, pr.ListComprehension):
for stmt in (item.stmt, item.middle, item.input):
stmt_els.extend(statement_elements_in_statement(stmt))
elif isinstance(item, pr.Lambda):
for stmt in item.params + item.returns:
stmt_els.extend(statement_elements_in_statement(stmt))
return stmt_els