VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-07 06:24:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Push much looping and merging of infering type vars into ValueSet

Browse Source
This commit is contained in:
Peter Law
2020-03-18 21:44:18 +00:00
parent 3c7621049c
commit f68d65ed59
4 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jedi/inference/base_value.py
View File

@@ -437,6 +437,18 @@ class ValueSet(BaseValueSet):
s = 'Optional[%s]' % s s = 'Optional[%s]' % s
return s return s
def infer_type_vars(self, value_set, is_class_value=False):
# Circular
from jedi.inference.gradual.annotation import merge_type_var_dicts
type_var_dict = {}
for value in self._set:
merge_type_var_dicts(
type_var_dict,
value.infer_type_vars(value_set, is_class_value),
)
return type_var_dict
NO_VALUES = ValueSet([]) NO_VALUES = ValueSet([])

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

@@ -268,11 +268,10 @@ def infer_type_vars_for_execution(function, arguments, annotation_dict):
elif kind is Parameter.VAR_KEYWORD: elif kind is Parameter.VAR_KEYWORD:
# TODO _dict_values is not public. # TODO _dict_values is not public.
actual_value_set = actual_value_set.try_merge('_dict_values') actual_value_set = actual_value_set.try_merge('_dict_values')
for ann in annotation_value_set: merge_type_var_dicts(
merge_type_var_dicts( annotation_variable_results,
annotation_variable_results, annotation_value_set.infer_type_vars(actual_value_set),
ann.infer_type_vars(actual_value_set), )
)
return annotation_variable_results return annotation_variable_results
@@ -301,11 +300,10 @@ def infer_type_vars_for_callable(arguments, lazy_params):
callable_param_values = lazy_callable_param.infer() callable_param_values = lazy_callable_param.infer()
# Infer unknown type var # Infer unknown type var
actual_value_set = lazy_value.infer() actual_value_set = lazy_value.infer()
for v in callable_param_values: merge_type_var_dicts(
merge_type_var_dicts( annotation_variable_results,
annotation_variable_results, callable_param_values.infer_type_vars(actual_value_set),
v.infer_type_vars(actual_value_set), )
)
return annotation_variable_results return annotation_variable_results
@@ -362,16 +360,15 @@ def merge_pairwise_generics(annotation_value, annotated_argument_class):
actual_generics = annotated_argument_class.get_generics() actual_generics = annotated_argument_class.get_generics()
for annotation_generics_set, actual_generic_set in zip(annotation_generics, actual_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(
merge_type_var_dicts( type_var_dict,
type_var_dict, annotation_generics_set.infer_type_vars(
nested_annotation_value.infer_type_vars( actual_generic_set,
actual_generic_set, # This is a note to ourselves that we have already
# This is a note to ourselves that we have already # converted the instance representation to its class.
# converted the instance representation to its class. is_class_value=True,
is_class_value=True, ),
), )
)
return type_var_dict return type_var_dict

13
jedi/inference/gradual/base.py
View File

@@ -209,13 +209,12 @@ class GenericClass(ClassMixin, DefineGenericBase):
if annotation_name == 'Iterable' and not is_class_value: if annotation_name == 'Iterable' and not is_class_value:
given = self.get_generics() given = self.get_generics()
if given: if given:
for nested_annotation_value in given[0]: merge_type_var_dicts(
merge_type_var_dicts( type_var_dict,
type_var_dict, given[0].infer_type_vars(
nested_annotation_value.infer_type_vars( value_set.merge_types_of_iterate(),
value_set.merge_types_of_iterate(), ),
), )
)
else: else:
# Note: we need to handle the MRO _in order_, so we need to extract # Note: we need to handle the MRO _in order_, so we need to extract
# the elements from the set first, then handle them, even if we put # the elements from the set first, then handle them, even if we put

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

@@ -200,25 +200,23 @@ class TypingClassValueWithIndex(_TypingClassMixin, TypingValueWithIndex):
) )
else: else:
for nested_annotation_value in given[0]: merge_type_var_dicts(
merge_type_var_dicts( type_var_dict,
type_var_dict, given[0].infer_type_vars(
nested_annotation_value.infer_type_vars( value_set,
value_set, is_class_value=True,
is_class_value=True, ),
), )
)
elif annotation_name == 'Callable': elif annotation_name == 'Callable':
given = self.get_generics() given = self.get_generics()
if len(given) == 2: if len(given) == 2:
for nested_annotation_value in given[1]: merge_type_var_dicts(
merge_type_var_dicts( type_var_dict,
type_var_dict, given[1].infer_type_vars(
nested_annotation_value.infer_type_vars( value_set.execute_annotation(),
value_set.execute_annotation(), ),
), )
)
elif annotation_name == 'Tuple': elif annotation_name == 'Tuple':
annotation_generics = self.get_generics() annotation_generics = self.get_generics()
@@ -228,13 +226,12 @@ class TypingClassValueWithIndex(_TypingClassMixin, TypingValueWithIndex):
# The parameter annotation is of the form `Tuple[T, ...]`, # The parameter annotation is of the form `Tuple[T, ...]`,
# so we treat the incoming tuple like a iterable sequence # so we treat the incoming tuple like a iterable sequence
# rather than a positional container of elements. # rather than a positional container of elements.
for nested_annotation_value in annotation_generics[0]: merge_type_var_dicts(
merge_type_var_dicts( type_var_dict,
type_var_dict, annotation_generics[0].infer_type_vars(
nested_annotation_value.infer_type_vars( value_set.merge_types_of_iterate(),
value_set.merge_types_of_iterate(), ),
), )
)
else: else:
# The parameter annotation has only explicit type parameters # The parameter annotation has only explicit type parameters