mirror of
https://github.com/davidhalter/jedi.git
synced 2025-12-06 14:04:26 +08:00
Refactor Interpeter completions a bit
This commit is contained in:
@@ -31,7 +31,7 @@ class MixedTreeName(TreeNameDefinition):
|
|||||||
"""
|
"""
|
||||||
inferred = super(MixedTreeName, self).infer()
|
inferred = super(MixedTreeName, self).infer()
|
||||||
if not inferred:
|
if not inferred:
|
||||||
for compiled_value in self.parent_context.compiled_values:
|
for compiled_value in self.parent_context.mixed_values:
|
||||||
for f in compiled_value.get_filters():
|
for f in compiled_value.get_filters():
|
||||||
values = ValueSet.from_sets(
|
values = ValueSet.from_sets(
|
||||||
n.infer() for n in f.get(self.string_name)
|
n.infer() for n in f.get(self.string_name)
|
||||||
@@ -48,9 +48,10 @@ class MixedParserTreeFilter(ParserTreeFilter):
|
|||||||
class MixedModuleContext(ModuleContext):
|
class MixedModuleContext(ModuleContext):
|
||||||
def __init__(self, tree_module_value, namespaces):
|
def __init__(self, tree_module_value, namespaces):
|
||||||
super(MixedModuleContext, self).__init__(tree_module_value)
|
super(MixedModuleContext, self).__init__(tree_module_value)
|
||||||
self.compiled_values = [
|
self.mixed_values = [
|
||||||
_create(self.inference_state, NamespaceObject(n))
|
self._get_mixed_object(
|
||||||
for n in namespaces
|
_create(self.inference_state, NamespaceObject(n))
|
||||||
|
) for n in namespaces
|
||||||
]
|
]
|
||||||
|
|
||||||
def _get_mixed_object(self, compiled_value):
|
def _get_mixed_object(self, compiled_value):
|
||||||
@@ -69,7 +70,6 @@ class MixedModuleContext(ModuleContext):
|
|||||||
self.get_global_filter(),
|
self.get_global_filter(),
|
||||||
)
|
)
|
||||||
|
|
||||||
for compiled_value in self.compiled_values:
|
for mixed_object in self.mixed_values:
|
||||||
mixed_object = self._get_mixed_object(compiled_value)
|
|
||||||
for filter in mixed_object.get_filters(until_position, origin_scope):
|
for filter in mixed_object.get_filters(until_position, origin_scope):
|
||||||
yield filter
|
yield filter
|
||||||
|
|||||||
Reference in New Issue
Block a user