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

Use py__name__ instead of var_name for type vars

Browse Source
This commit is contained in:
Dave Halter
2018-09-15 11:43:23 +02:00
parent 1244eb9998
commit 6807e3b6d5
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,7 +366,7 @@ class TypeVarClass(_BaseTypingContext):
class TypeVar(_BaseTypingContext): class TypeVar(_BaseTypingContext):
def __init__(self, evaluator, parent_context, tree_name, var_name, unpacked_args): def __init__(self, evaluator, parent_context, tree_name, var_name, unpacked_args):
super(TypeVar, self).__init__(evaluator, parent_context, tree_name) super(TypeVar, self).__init__(evaluator, parent_context, tree_name)
self.var_name = var_name self._var_name = var_name
self._constraints_lazy_contexts = [] self._constraints_lazy_contexts = []
self._bound_lazy_context = None self._bound_lazy_context = None
@@ -385,6 +385,9 @@ class TypeVar(_BaseTypingContext):
else: else:
debug.warning('Invalid TypeVar param name %s', key) debug.warning('Invalid TypeVar param name %s', key)
def py__name__(self):
return self._var_name
def get_filters(self, *args, **kwargs): def get_filters(self, *args, **kwargs):
return iter([]) return iter([])
@@ -408,7 +411,7 @@ class TypeVar(_BaseTypingContext):
return self._get_classes().execute_annotation() return self._get_classes().execute_annotation()
def __repr__(self): def __repr__(self):
return '<%s: %s>' % (self.__class__.__name__, self.var_name) return '<%s: %s>' % (self.__class__.__name__, self.py__name__())
class OverloadFunction(_BaseTypingContext): class OverloadFunction(_BaseTypingContext):
@@ -425,7 +428,6 @@ class BoundTypeVarName(AbstractNameDefinition):
def __init__(self, type_var, context_set): def __init__(self, type_var, context_set):
self._type_var = type_var self._type_var = type_var
self.parent_context = type_var.parent_context self.parent_context = type_var.parent_context
self.var_name = self._type_var.var_name
self._context_set = context_set self._context_set = context_set
def infer(self): def infer(self):
@@ -439,8 +441,11 @@ class BoundTypeVarName(AbstractNameDefinition):
yield context yield context
return ContextSet.from_iterable(iter_()) return ContextSet.from_iterable(iter_())
def py__name__(self):
return self._type_var.py__name__()
def __repr__(self): def __repr__(self):
return '<%s %s -> %s>' % (self.__class__.__name__, self.var_name, self._context_set) return '<%s %s -> %s>' % (self.__class__.__name__, self.py__name__(), self._context_set)
class TypeVarFilter(object): class TypeVarFilter(object):
@@ -460,7 +465,7 @@ class TypeVarFilter(object):
def get(self, name): def get(self, name):
for i, type_var in enumerate(self._type_vars): for i, type_var in enumerate(self._type_vars):
if type_var.var_name == name: if type_var.py__name__() == name:
try: try:
return [BoundTypeVarName(type_var, self._given_types[i])] return [BoundTypeVarName(type_var, self._given_types[i])]
except IndexError: except IndexError:
@@ -601,7 +606,7 @@ class LazyAnnotatedBaseClass(object):
new = ContextSet() new = ContextSet()
for type_var in type_var_set: for type_var in type_var_set:
if isinstance(type_var, TypeVar): if isinstance(type_var, TypeVar):
names = filter.get(type_var.var_name) names = filter.get(type_var.py__name__())
new |= ContextSet.from_sets( new |= ContextSet.from_sets(
name.infer() for name in names name.infer() for name in names
) )