VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-22 21:31:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify get_executable_nodes.

Browse Source
This commit is contained in:
Dave Halter
2017-04-08 14:05:18 +02:00
parent 65a6c61dc6
commit 4cd7f40e3b
1 changed files with 15 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
jedi/parser_utils.py
View File

@@ -1,13 +1,7 @@
from jedi.parser.python.tree import PythonLeaf _EXECUTE_NODES = set([
_IGNORE_EXECUTE_NODES = set([ 'funcdef', 'classdef', 'import_from', 'import_name', 'test', 'or_test',
'suite', 'subscriptlist', 'subscript', 'simple_stmt', 'sliceop', 'and_test', 'not_test', 'comparison', 'expr', 'xor_expr', 'and_expr',
'testlist_comp', 'dictorsetmaker', 'trailer', 'decorators', 'shift_expr', 'arith_expr', 'atom_expr', 'term', 'factor', 'power', 'atom'
'decorated', 'arglist', 'argument', 'exprlist', 'testlist',
'testlist_safe', 'testlist1', 'global_stmt', 'file_input', 'for_stmt',
'while_stmt', 'if_stmt', 'try_stmt', 'with_stmt', 'comp_for', 'comp_if',
'param', 'except_clause', 'dotted_name', 'keyword_stmt', 'return_stmt',
'del_stmt', 'pass_stmt', 'nonlocal_stmt', 'assert_stmt', 'break_stmt',
'continue_stmt', 'raise_stmt', 'yield_stmt'
]) ])
return_ = 'import_name', 'import_from' return_ = 'import_name', 'import_from'
@@ -22,32 +16,7 @@ def get_executable_nodes(node, last_added=False):
""" """
result = [] result = []
typ = node.type typ = node.type
if typ == 'classdef': if typ == 'name':
# Yield itself, class needs to be executed for decorator checks.
result.append(node)
# Super arguments.
arglist = node.get_super_arglist()
try:
children = arglist.children
except AttributeError:
if arglist is not None:
result += get_executable_nodes(arglist)
else:
for argument in children:
if argument.type == 'argument':
# metaclass= or list comprehension or */**
raise NotImplementedError('Metaclasses not implemented, yet.')
else:
result += get_executable_nodes(argument)
# Care for the class suite:
suite = node.children[-1]
result += get_executable_nodes(suite)
elif typ == 'yield_expr':
if len(node.children) > 1:
# TODO delete?
result += get_executable_nodes(node.children[1])
elif typ == 'name':
next_leaf = node.get_next_leaf() next_leaf = node.get_next_leaf()
if last_added is False and node.parent.type != 'param' and next_leaf != '=': if last_added is False and node.parent.type != 'param' and next_leaf != '=':
result.append(node) result.append(node)
@@ -57,20 +26,22 @@ def get_executable_nodes(node, last_added=False):
result.append(node) result.append(node)
for child in node.children: for child in node.children:
result += get_executable_nodes(child, last_added=True) result += get_executable_nodes(child, last_added=True)
elif isinstance(node, PythonLeaf):
pass
elif typ == 'decorator': elif typ == 'decorator':
# decorator # decorator
if node.children[-2] == ')': if node.children[-2] == ')':
node = children[-3] node = node.children[-3]
if node != '(': if node != '(':
result += get_executable_nodes(node) result += get_executable_nodes(node)
else: else:
if node.type not in _IGNORE_EXECUTE_NODES and not last_added: try:
result.append(node) children = node.children
#last_added = True except AttributeError:
pass
else:
if node.type in _EXECUTE_NODES and not last_added:
result.append(node)
for child in node.children: for child in children:
result += get_executable_nodes(child, last_added) result += get_executable_nodes(child, last_added)
return result return result