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

Fix: CompFor.nodes_to_execute didn't include the right nodes. Sometimes too many, sometimes too few.

Browse Source
This commit is contained in:
Dave Halter
2015-11-18 18:00:15 +01:00
parent 595b803f1f
commit 8174b312b5
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/__main__.py
View File

@@ -32,6 +32,8 @@ def _start_linter():
print(error) print(error)
except Exception: except Exception:
if '--pdb' in sys.argv: if '--pdb' in sys.argv:
import traceback
traceback.print_exc()
import pdb import pdb
pdb.post_mortem() pdb.post_mortem()
else: else:

12
jedi/parser/tree.py
View File

@@ -1462,4 +1462,14 @@ class CompFor(BaseNode):
return _defined_names(self.children[1]) return _defined_names(self.children[1])
def nodes_to_execute(self, last_added=False): def nodes_to_execute(self, last_added=False):
return self.children[-1].nodes_to_execute() last = self.children[-1]
if last.type == 'comp_if':
for node in last.children[-1].nodes_to_execute():
yield node
last = self.children[-2]
elif last.type == 'comp_for':
for node in last.nodes_to_execute():
yield node
last = self.children[-2]
for node in last.nodes_to_execute():
yield node