VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Make FunctionExecutionContext.arguments private

Browse Source
This commit is contained in:
Dave Halter
2019-09-02 21:24:21 +02:00
parent 73003a995b
commit bdb01c7546
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jedi/inference/filters.py
View File

@@ -143,22 +143,22 @@ class ParserTreeFilter(AbstractUsedNamesFilter):
class FunctionExecutionFilter(ParserTreeFilter): class FunctionExecutionFilter(ParserTreeFilter):
def __init__(self, parent_context, function_value, node_context=None, def __init__(self, parent_context, function_value,
until_position=None, origin_scope=None): until_position, origin_scope, arguments):
super(FunctionExecutionFilter, self).__init__( super(FunctionExecutionFilter, self).__init__(
parent_context, parent_context,
node_context, until_position=until_position,
until_position, origin_scope=origin_scope,
origin_scope
) )
self._function_value = function_value self._function_value = function_value
self._arguments = arguments
@to_list @to_list
def _convert_names(self, names): def _convert_names(self, names):
for name in names: for name in names:
param = search_ancestor(name, 'param') param = search_ancestor(name, 'param')
if param: if param:
yield ParamName(self._function_value, name, self.parent_context.arguments) yield ParamName(self._function_value, name, self._arguments)
else: else:
yield TreeNameDefinition(self.parent_context, name) yield TreeNameDefinition(self.parent_context, name)

12
jedi/inference/value/function.py
View File

@@ -160,12 +160,10 @@ class MethodValue(FunctionValue):
class FunctionExecutionContext(ValueContext, TreeContextMixin): class FunctionExecutionContext(ValueContext, TreeContextMixin):
function_execution_filter = FunctionExecutionFilter
def __init__(self, function_value, arguments): def __init__(self, function_value, arguments):
super(FunctionExecutionContext, self).__init__(function_value) super(FunctionExecutionContext, self).__init__(function_value)
self.function_value = function_value self.function_value = function_value
self.arguments = arguments self._arguments = arguments
@inference_state_method_cache(default=NO_VALUES) @inference_state_method_cache(default=NO_VALUES)
@recursion.execution_recursion_decorator() @recursion.execution_recursion_decorator()
@@ -282,10 +280,14 @@ class FunctionExecutionContext(ValueContext, TreeContextMixin):
def get_filters(self, until_position=None, origin_scope=None): def get_filters(self, until_position=None, origin_scope=None):
yield FunctionExecutionFilter( yield FunctionExecutionFilter(
self, self._value, until_position=until_position, origin_scope=origin_scope) self, self._value,
until_position=until_position,
origin_scope=origin_scope,
arguments=self._arguments
)
def get_executed_param_names_and_issues(self): def get_executed_param_names_and_issues(self):
return self.arguments.get_executed_param_names_and_issues(self._value) return self._arguments.get_executed_param_names_and_issues(self._value)
def infer(self): def infer(self):
""" """

5
jedi/plugins/stdlib.py
View File

@@ -270,8 +270,9 @@ class SuperInstance(LazyValueWrapper):
@argument_clinic('[type[, obj]], /', want_context=True) @argument_clinic('[type[, obj]], /', want_context=True)
def builtins_super(types, objects, context): def builtins_super(types, objects, context):
if isinstance(context, FunctionExecutionContext): if isinstance(context, FunctionExecutionContext):
if isinstance(context.arguments, InstanceArguments): # TODO _arguments should be private. make this different.
instance = context.arguments.instance if isinstance(context._arguments, InstanceArguments):
instance = context._arguments.instance
# TODO if a class is given it doesn't have to be the direct super # TODO if a class is given it doesn't have to be the direct super
# class, it can be an anecestor from long ago. # class, it can be an anecestor from long ago.
return ValueSet({SuperInstance(instance.inference_state, instance)}) return ValueSet({SuperInstance(instance.inference_state, instance)})