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

Use a CompiledInstanceNameFilter that wraps the class name as well

Browse Source
This commit is contained in:
Dave Halter
2018-08-04 13:10:14 +02:00
parent 72f2a9e4a5
commit bd43608f98
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
jedi/evaluate/context/instance.py
View File

@@ -265,17 +265,23 @@ class AnonymousInstance(TreeInstance):
class CompiledInstanceName(compiled.CompiledName): class CompiledInstanceName(compiled.CompiledName):
def __init__(self, evaluator, instance, parent_context, name):
super(CompiledInstanceName, self).__init__(evaluator, parent_context, name) def __init__(self, evaluator, instance, klass, name):
super(CompiledInstanceName, self).__init__(
evaluator,
klass.parent_context,
name.string_name
)
self._instance = instance self._instance = instance
self._class = klass
self._class_member_name = name
@iterator_to_context_set @iterator_to_context_set
def infer(self): def infer(self):
for result_context in super(CompiledInstanceName, self).infer(): for result_context in self._class_member_name.infer():
is_function = result_context.api_type == 'function' is_function = result_context.api_type == 'function'
if result_context.tree_node is not None and is_function: if result_context.tree_node is not None and is_function:
yield BoundMethod(self._instance, self._class, result_context)
yield BoundMethod(self._instance, self.parent_context, result_context)
else: else:
if is_function: if is_function:
yield CompiledBoundMethod(result_context) yield CompiledBoundMethod(result_context)
@@ -283,20 +289,26 @@ class CompiledInstanceName(compiled.CompiledName):
yield result_context yield result_context
class CompiledInstanceClassFilter(compiled.CompiledObjectFilter): class CompiledInstanceClassFilter(filters.AbstractFilter):
name_class = CompiledInstanceName name_class = CompiledInstanceName
def __init__(self, evaluator, instance, compiled_object): def __init__(self, evaluator, instance, klass):
super(CompiledInstanceClassFilter, self).__init__( self._evaluator = evaluator
evaluator,
compiled_object,
is_instance=True,
)
self._instance = instance self._instance = instance
self._class = klass
self._class_filter = next(klass.get_filters(is_instance=True))
def _create_name(self, name): def get(self, name):
return self.name_class( return self._convert(self._class_filter.get(name))
self._evaluator, self._instance, self._compiled_object, name)
def values(self):
return self._convert(self._class_filter.values())
def _convert(self, names):
return [
CompiledInstanceName(self._evaluator, self._instance, self._class, n)
for n in names
]
class BoundMethod(AbstractFunction): class BoundMethod(AbstractFunction):
@@ -332,11 +344,6 @@ class CompiledBoundMethod(compiled.CompiledObject):
return list(super(CompiledBoundMethod, self).get_param_names())[1:] return list(super(CompiledBoundMethod, self).get_param_names())[1:]
class InstanceNameDefinition(filters.TreeNameDefinition):
def infer(self):
return super(InstanceNameDefinition, self).infer()
class SelfName(filters.TreeNameDefinition): class SelfName(filters.TreeNameDefinition):
""" """
This name calculates the parent_context lazily. This name calculates the parent_context lazily.
@@ -379,8 +386,6 @@ class InstanceClassFilter(filters.AbstractFilter):
resulting names in LazyINstanceClassName. The idea is that the class name resulting names in LazyINstanceClassName. The idea is that the class name
filtering can be very flexible and always be reflected in instances. filtering can be very flexible and always be reflected in instances.
""" """
name_class = LazyInstanceClassName
def __init__(self, evaluator, context, class_context, origin_scope): def __init__(self, evaluator, context, class_context, origin_scope):
self._instance = context self._instance = context
self._class_context = class_context self._class_context = class_context