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

Make tuple generic parameters work

Browse Source
This commit is contained in:
Peter Law
2020-02-22 20:36:57 +00:00
parent 969a8f1fd9
commit bc53dabce3
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
jedi/inference/gradual/annotation.py
View File

@@ -363,6 +363,35 @@ def _infer_type_vars(annotation_value, value_set, is_class_value=False):
value_set.execute_annotation(),
)
)
elif annotation_name == 'Tuple':
# TODO: check that this works both for fixed and variadic tuples
# (and maybe for combiantions of those).
# TODO: this logic is pretty similar to the general logic below, can
# we combine them?
for element in value_set:
py_class = element.py__class__()
if not isinstance(py_class, GenericClass):
py_class = element
if not isinstance(py_class, DefineGenericBase):
continue
annotation_generics = annotation_value.get_generics()
actual_generics = py_class.get_generics()
for annotation_generics_set, actual_generic_set in zip(annotation_generics, actual_generics):
for nested_annotation_value in annotation_generics_set:
_merge_type_var_dicts(
type_var_dict,
_infer_type_vars(
nested_annotation_value,
actual_generic_set,
# This is a note to ourselves that we
# have already converted the instance
# representation to its class.
is_class_value=True,
),
)
elif isinstance(annotation_value, GenericClass):
if annotation_name == 'Iterable' and not is_class_value:
given = annotation_value.get_generics()

7
jedi/inference/gradual/typing.py
View File

@@ -241,12 +241,7 @@ class Callable(BaseTypingValueWithGenerics):
return infer_return_for_callable(arguments, param_values, result_values)
class Tuple(LazyValueWrapper):
def __init__(self, parent_context, name, generics_manager):
self.inference_state = parent_context.inference_state
self.parent_context = parent_context
self._generics_manager = generics_manager
class Tuple(BaseTypingValueWithGenerics):
def _is_homogenous(self):
# To specify a variable-length tuple of homogeneous type, Tuple[T, ...]
# is used.