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

Fix a bug where parent_context was a value

Browse Source
This commit is contained in:
Dave Halter
2020-01-07 11:12:06 +01:00
parent fdb5071bec
commit 800ab65701
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/inference/compiled/mixed.py
View File

@@ -118,6 +118,7 @@ class MixedName(compiled.CompiledName):
if parent_value is None: if parent_value is None:
parent_context = None parent_context = None
else: else:
assert parent_value is not None
parent_context = parent_value.as_context() parent_context = parent_value.as_context()
if parent_context is None or isinstance(parent_context, MixedContext): if parent_context is None or isinstance(parent_context, MixedContext):
@@ -130,7 +131,7 @@ class MixedName(compiled.CompiledName):
}) })
# TODO use logic from compiled.CompiledObjectFilter # TODO use logic from compiled.CompiledObjectFilter
access_paths = self.parent_context.access_handle.getattr_paths( access_paths = self._parent_value.access_handle.getattr_paths(
self.string_name, self.string_name,
default=None default=None
) )
@@ -266,6 +267,8 @@ def _create(inference_state, access_handle, parent_context, *args):
compiled_object = create_cached_compiled_object( compiled_object = create_cached_compiled_object(
inference_state, inference_state,
access_handle, access_handle,
# TODO It looks like we have to use the compiled object as a parent context.
# Why is that?
parent_context=None if parent_context is None parent_context=None if parent_context is None
else parent_context.compiled_object.as_context() # noqa else parent_context.compiled_object.as_context() # noqa
) )

13
jedi/inference/compiled/value.py
View File

@@ -296,9 +296,10 @@ class CompiledObject(Value):
class CompiledName(AbstractNameDefinition): class CompiledName(AbstractNameDefinition):
def __init__(self, inference_state, parent_context, name): def __init__(self, inference_state, parent_value, name):
self._inference_state = inference_state self._inference_state = inference_state
self.parent_context = parent_context self.parent_context = parent_value.as_context()
self._parent_value = parent_value
self.string_name = name self.string_name = name
def py__doc__(self): def py__doc__(self):
@@ -336,7 +337,7 @@ class CompiledName(AbstractNameDefinition):
@underscore_memoization @underscore_memoization
def infer(self): def infer(self):
return ValueSet([_create_from_name( return ValueSet([_create_from_name(
self._inference_state, self.parent_context, self.string_name self._inference_state, self._parent_value, self.string_name
)]) )])
@@ -484,7 +485,11 @@ class CompiledObjectFilter(AbstractFilter):
return names return names
def _create_name(self, name): def _create_name(self, name):
return self.name_class(self._inference_state, self.compiled_object, name) return self.name_class(
self._inference_state,
self.compiled_object,
name
)
def __repr__(self): def __repr__(self):
return "<%s: %s>" % (self.__class__.__name__, self.compiled_object) return "<%s: %s>" % (self.__class__.__name__, self.compiled_object)

4
jedi/inference/value/instance.py
View File

@@ -409,9 +409,11 @@ class AnonymousInstance(_BaseTreeInstance):
class CompiledInstanceName(compiled.CompiledName): class CompiledInstanceName(compiled.CompiledName):
def __init__(self, inference_state, instance, klass, name): def __init__(self, inference_state, instance, klass, name):
parent_value = klass.parent_context.get_value()
assert parent_value is not None, "How? Please reproduce and report"
super(CompiledInstanceName, self).__init__( super(CompiledInstanceName, self).__init__(
inference_state, inference_state,
klass.parent_context, parent_value,
name.string_name name.string_name
) )
self._instance = instance self._instance = instance