1
0
forked from VimPlug/jedi

Small fixes to the origin_scopes.

This commit is contained in:
Dave Halter
2016-11-12 17:01:26 +01:00
parent 853f9fdb08
commit cb86cdec68
3 changed files with 11 additions and 1 deletions

View File

@@ -201,7 +201,8 @@ class Completion:
completion_names = []
debug.dbg('trailer completion contexts: %s', contexts)
for context in contexts:
for filter in context.get_filters(search_global=False, origin_scope=user_context):
for filter in context.get_filters(
search_global=False, origin_scope=user_context.get_node()):
completion_names += filter.values()
return completion_names

View File

@@ -8,6 +8,9 @@ class Context(object):
self.evaluator = evaluator
self.parent_context = parent_context
def get_node(self):
return None
def get_parent_flow_context(self):
return self.parent_context

View File

@@ -613,6 +613,9 @@ class FunctionExecutionContext(Executed):
#self.names_dict = funcdef.names_dict
#self._copied_funcdef = funcdef
def get_node(self):
return self.funcdef
@memoize_default(default=set())
@recursion.execution_recursion_decorator
def get_return_values(self, check_yields=False):
@@ -774,6 +777,9 @@ class ModuleContext(use_metaclass(CachedMetaClass, context.TreeContext, Wrapper)
self.module_node = module_node
self.path = None
def get_node(self):
return self.module_node
def names_dicts(self, search_global):
yield self.base.names_dict
yield self._module_attributes_dict()