VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-05-16 21:44:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

iterating list comprehensions should be possible.

Browse Source
This commit is contained in:
Dave Halter
2014-12-01 01:08:50 +01:00
parent ed1915eea0
commit 4ee5ad4ce3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/iterable.py
+6 -4
View File
@@ -160,6 +160,9 @@ class Comprehension(IterableWrapper):
class ListComprehension(Comprehension): class ListComprehension(Comprehension):
def get_index_types(self, evaluator, index): def get_index_types(self, evaluator, index):
return self.iter_content()
def iter_content(self):
return self._evaluator.eval_element(self.eval_node()) return self._evaluator.eval_element(self.eval_node())
@property @property
@@ -385,7 +388,7 @@ def get_iterator_types(inputs):
# Take the first statement (for has always only # Take the first statement (for has always only
# one, remember `in`). And follow it. # one, remember `in`). And follow it.
for it in inputs: for it in inputs:
if isinstance(it, (Generator, Array, ArrayInstance)): if isinstance(it, (Generator, Array, ArrayInstance, Comprehension)):
iterators.append(it) iterators.append(it)
else: else:
if not hasattr(it, 'execute_subscope_by_name'): if not hasattr(it, 'execute_subscope_by_name'):
@@ -400,9 +403,8 @@ def get_iterator_types(inputs):
from jedi.evaluate.representation import Instance from jedi.evaluate.representation import Instance
for it in iterators: for it in iterators:
if isinstance(it, Array): if isinstance(it, Array):
# Array is a little bit special, since this is an internal # Array is a little bit special, since this is an internal array,
# array, but there's also the list builtin, which is # but there's also the list builtin, which is another thing.
# another thing.
result += it.values() result += it.values()
elif isinstance(it, Instance): elif isinstance(it, Instance):
# __iter__ returned an instance. # __iter__ returned an instance.