forked from VimPlug/jedi
Also move the remaining get_params to get_executed_params
Remove the class's get_params entirely, because it is apparently not needed and contained a funny return.
This commit is contained in:
@@ -246,5 +246,5 @@ class FunctionExecutionContext(TreeContext):
|
|||||||
origin_scope=origin_scope)
|
origin_scope=origin_scope)
|
||||||
|
|
||||||
@evaluator_method_cache()
|
@evaluator_method_cache()
|
||||||
def get_params(self):
|
def get_executed_params(self):
|
||||||
return self.var_args.get_executed_params(self)
|
return self.var_args.get_executed_params(self)
|
||||||
|
|||||||
@@ -175,11 +175,6 @@ class ClassContext(use_metaclass(CachedMetaClass, TreeContext)):
|
|||||||
def py__class__(self):
|
def py__class__(self):
|
||||||
return compiled.builtin_from_name(self.evaluator, u'type')
|
return compiled.builtin_from_name(self.evaluator, u'type')
|
||||||
|
|
||||||
def get_params(self):
|
|
||||||
from jedi.evaluate.context import AnonymousInstance
|
|
||||||
anon = AnonymousInstance(self.evaluator, self.parent_context, self)
|
|
||||||
return [AnonymousInstanceParamName(anon, param.name) for param in self.funcdef.get_params()]
|
|
||||||
|
|
||||||
def get_filters(self, search_global, until_position=None, origin_scope=None, is_instance=False):
|
def get_filters(self, search_global, until_position=None, origin_scope=None, is_instance=False):
|
||||||
if search_global:
|
if search_global:
|
||||||
yield ParserTreeFilter(
|
yield ParserTreeFilter(
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ def search_params(evaluator, execution_context, funcdef):
|
|||||||
)
|
)
|
||||||
if function_executions:
|
if function_executions:
|
||||||
zipped_params = zip(*list(
|
zipped_params = zip(*list(
|
||||||
function_execution.get_params()
|
function_execution.get_executed_params()
|
||||||
for function_execution in function_executions
|
for function_execution in function_executions
|
||||||
))
|
))
|
||||||
params = [DynamicExecutedParams(evaluator, executed_params) for executed_params in zipped_params]
|
params = [DynamicExecutedParams(evaluator, executed_params) for executed_params in zipped_params]
|
||||||
@@ -208,7 +208,7 @@ def _check_name_for_execution(evaluator, context, compare_node, name, trailer):
|
|||||||
# Here we're trying to find decorators by checking the first
|
# Here we're trying to find decorators by checking the first
|
||||||
# parameter. It's not very generic though. Should find a better
|
# parameter. It's not very generic though. Should find a better
|
||||||
# solution that also applies to nested decorators.
|
# solution that also applies to nested decorators.
|
||||||
params = value.parent_context.get_params()
|
params = value.parent_context.get_executed_params()
|
||||||
if len(params) != 1:
|
if len(params) != 1:
|
||||||
continue
|
continue
|
||||||
values = params[0].infer()
|
values = params[0].infer()
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ class ParamName(AbstractTreeName):
|
|||||||
return self.get_param().infer()
|
return self.get_param().infer()
|
||||||
|
|
||||||
def get_param(self):
|
def get_param(self):
|
||||||
params = self.parent_context.get_params()
|
params = self.parent_context.get_executed_params()
|
||||||
param_node = search_ancestor(self.tree_name, 'param')
|
param_node = search_ancestor(self.tree_name, 'param')
|
||||||
return params[param_node.position_index]
|
return params[param_node.position_index]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user