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

DynamicExecutedParams -> DynamicExecutedParamName

Browse Source
This commit is contained in:
Dave Halter
2019-08-24 14:14:45 +02:00
parent 9469533b9f
commit 06a6cea02d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/inference/arguments.py
View File

@@ -275,7 +275,7 @@ class TreeArguments(AbstractArguments):
return '<%s: %s>' % (self.__class__.__name__, self.argument_node) return '<%s: %s>' % (self.__class__.__name__, self.argument_node)
def get_calling_nodes(self): def get_calling_nodes(self):
from jedi.inference.dynamic import DynamicExecutedParams from jedi.inference.dynamic import DynamicExecutedParamName
old_arguments_list = [] old_arguments_list = []
arguments = self arguments = self
@@ -291,7 +291,7 @@ class TreeArguments(AbstractArguments):
if not isinstance(names[0], ParamName): if not isinstance(names[0], ParamName):
break break
param = names[0].get_param() param = names[0].get_param()
if isinstance(param, DynamicExecutedParams): if isinstance(param, DynamicExecutedParamName):
# For dynamic searches we don't even want to see errors. # For dynamic searches we don't even want to see errors.
return [] return []
if param.var_args is None: if param.var_args is None:

12
jedi/inference/dynamic.py
View File

@@ -29,22 +29,24 @@ from jedi.parser_utils import get_parent_scope
from jedi.inference.value import instance from jedi.inference.value import instance
from jedi.inference.base_value import ValueSet, NO_VALUES from jedi.inference.base_value import ValueSet, NO_VALUES
from jedi.inference import recursion from jedi.inference import recursion
from jedi.inference.names import ParamNameWrapper
MAX_PARAM_SEARCHES = 20 MAX_PARAM_SEARCHES = 20
class DynamicExecutedParams(object): class DynamicExecutedParamName(ParamNameWrapper):
""" """
Simulates being a parameter while actually just being multiple params. Simulates being a parameter while actually just being multiple params.
""" """
def __init__(self, inference_state, executed_param_names): def __init__(self, executed_param_names):
self.inference_state = inference_state super(DynamicExecutedParamName, self).__init__(executed_param_names[0])
self._executed_param_names = executed_param_names self._executed_param_names = executed_param_names
def infer(self): def infer(self):
with recursion.execution_allowed(self.inference_state, self) as allowed: inf = self.parent_context.inference_state
with recursion.execution_allowed(inf, self) as allowed:
# We need to catch recursions that may occur, because an # We need to catch recursions that may occur, because an
# anonymous functions can create an anonymous parameter that is # anonymous functions can create an anonymous parameter that is
# more or less self referencing. # more or less self referencing.
@@ -101,7 +103,7 @@ def search_param_names(inference_state, execution_context, funcdef):
function_execution.get_executed_param_names_and_issues()[0] function_execution.get_executed_param_names_and_issues()[0]
for function_execution in function_executions for function_execution in function_executions
)) ))
params = [DynamicExecutedParams(inference_state, executed_param_names) params = [DynamicExecutedParamName(executed_param_names)
for executed_param_names in zipped_param_names] for executed_param_names in zipped_param_names]
else: else:
return create_default_params(execution_context, funcdef) return create_default_params(execution_context, funcdef)