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

Start using gather_annotation_classes

Browse Source
This commit is contained in:
Dave Halter
2018-11-27 01:17:12 +01:00
parent 5bb88ca703
commit 5e6e4356fc
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jedi/evaluate/context/typing.py
View File

@@ -145,11 +145,6 @@ class _WithIndexBase(_BaseTypingContext):
self._index_context,
)
def _execute_annotations_for_all_indexes(self):
return ContextSet.from_sets(
_iter_over_arguments(self._index_context, self._context_of_index)
).execute_annotation()
class TypingContextWithIndex(_WithIndexBase):
def execute_annotation(self):
@@ -158,11 +153,11 @@ class TypingContextWithIndex(_WithIndexBase):
if string_name == 'Union':
# This is kind of a special case, because we have Unions (in Jedi
# ContextSets).
return self._execute_annotations_for_all_indexes()
return self.gather_annotation_classes().execute_annotation()
elif string_name == 'Optional':
# Optional is basically just saying it's either None or the actual
# type.
return self._execute_annotations_for_all_indexes() \
return self.gather_annotation_classes().execute_annotation() \
| ContextSet([builtin_from_name(self.evaluator, u'None')])
elif string_name == 'Type':
# The type is actually already given in the index_context
@@ -326,7 +321,9 @@ class Tuple(_ContainerBase):
if self._is_homogenous():
return self._get_getitem_contexts(0).execute_annotation()
return self._execute_annotations_for_all_indexes()
return ContextSet.from_sets(
_iter_over_arguments(self._index_context, self._context_of_index)
).execute_annotation()
class Generic(_ContainerBase):