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

Create separate classes for FakeSequence

Browse Source
This commit is contained in:
Dave Halter
2019-08-25 14:31:15 +02:00
parent 51912db46a
commit 473dbb0f69
5 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
jedi/inference/value/iterable.py
View File

@@ -298,15 +298,14 @@ class DictComprehension(ComprehensionMixin, Sequence):
@publish_method('values')
def _imitate_values(self):
lazy_value = LazyKnownValues(self._dict_values())
return ValueSet([FakeSequence(self.inference_state, u'list', [lazy_value])])
return ValueSet([FakeList(self.inference_state, [lazy_value])])
@publish_method('items')
def _imitate_items(self):
lazy_values = [
LazyKnownValue(
FakeSequence(
FakeTuple(
self.inference_state,
u'tuple',
[LazyKnownValues(key),
LazyKnownValues(value)]
)
@@ -314,7 +313,7 @@ class DictComprehension(ComprehensionMixin, Sequence):
for key, value in self._iterate()
]
return ValueSet([FakeSequence(self.inference_state, u'list', lazy_values)])
return ValueSet([FakeList(self.inference_state, lazy_values)])
def get_mapping_item_values(self):
return self._dict_keys(), self._dict_values()
@@ -469,19 +468,19 @@ class DictLiteralValue(_DictMixin, SequenceLiteralValue):
@publish_method('values')
def _imitate_values(self):
lazy_value = LazyKnownValues(self._dict_values())
return ValueSet([FakeSequence(self.inference_state, u'list', [lazy_value])])
return ValueSet([FakeList(self.inference_state, [lazy_value])])
@publish_method('items')
def _imitate_items(self):
lazy_values = [
LazyKnownValue(FakeSequence(
self.inference_state, u'tuple',
LazyKnownValue(FakeTuple(
self.inference_state,
(LazyTreeValue(self._defining_context, key_node),
LazyTreeValue(self._defining_context, value_node))
)) for key_node, value_node in self.get_tree_entries()
]
return ValueSet([FakeSequence(self.inference_state, u'list', lazy_values)])
return ValueSet([FakeList(self.inference_state, lazy_values)])
def _dict_keys(self):
return ValueSet.from_sets(
@@ -493,14 +492,13 @@ class DictLiteralValue(_DictMixin, SequenceLiteralValue):
return self._dict_keys(), self._dict_values()
class FakeSequence(Sequence):
def __init__(self, inference_state, array_type, lazy_value_list):
class _FakeSequence(Sequence):
def __init__(self, inference_state, lazy_value_list):
"""
type should be one of "tuple", "list"
"""
super(FakeSequence, self).__init__(inference_state)
super(_FakeSequence, self).__init__(inference_state)
self._lazy_value_list = lazy_value_list
self.array_type = array_type
def py__simple_getitem__(self, index):
if isinstance(index, slice):
@@ -520,6 +518,14 @@ class FakeSequence(Sequence):
return "<%s of %s>" % (type(self).__name__, self._lazy_value_list)
class FakeTuple(_FakeSequence):
array_type = u'tuple'
class FakeList(_FakeSequence):
array_type = u'tuple'
class FakeDict(_DictMixin, Sequence):
array_type = u'dict'
@@ -553,8 +559,8 @@ class FakeDict(_DictMixin, Sequence):
@publish_method('values')
def _values(self):
return ValueSet([FakeSequence(
self.inference_state, u'tuple',
return ValueSet([FakeTuple(
self.inference_state,
[LazyKnownValues(self._dict_values())]
)])