Avoid using arguments.get_executed_param_names_and_issues

This commit is contained in:
Dave Halter
2019-09-03 00:47:10 +02:00
parent fe8a605d4a
commit a67861a320
3 changed files with 9 additions and 4 deletions

View File

@@ -19,13 +19,13 @@ It works as follows:
from jedi import settings from jedi import settings
from jedi import debug from jedi import debug
from jedi.parser_utils import get_parent_scope
from jedi.inference.cache import inference_state_function_cache from jedi.inference.cache import inference_state_function_cache
from jedi.inference import imports from jedi.inference import imports
from jedi.inference.arguments import TreeArguments from jedi.inference.arguments import TreeArguments
from jedi.inference.param import create_default_params from jedi.inference.param import create_default_params, get_executed_param_names
from jedi.inference.helpers import is_stdlib_path from jedi.inference.helpers import is_stdlib_path
from jedi.inference.utils import to_list from jedi.inference.utils import to_list
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
@@ -100,7 +100,7 @@ def search_param_names(inference_state, function_value, funcdef):
) )
if arguments_list: if arguments_list:
zipped_param_names = zip(*list( zipped_param_names = zip(*list(
arguments.get_executed_param_names_and_issues(function_value)[0] get_executed_param_names(function_value, arguments)[0]
for arguments in arguments_list for arguments in arguments_list
)) ))
params = [DynamicExecutedParamName(executed_param_names) params = [DynamicExecutedParamName(executed_param_names)

View File

@@ -205,6 +205,10 @@ def get_executed_param_names_and_issues(function_value, arguments):
return result_params, issues return result_params, issues
def get_executed_param_names(function_value, arguments):
return get_executed_param_names_and_issues(function_value, arguments)
def _error_argument_count(funcdef, actual_count): def _error_argument_count(funcdef, actual_count):
params = funcdef.get_params() params = funcdef.get_params()
default_arguments = sum(1 for p in params if p.default or p.star_count) default_arguments = sum(1 for p in params if p.default or p.star_count)

View File

@@ -94,8 +94,9 @@ class TreeSignature(AbstractSignature):
return params return params
def matches_signature(self, arguments): def matches_signature(self, arguments):
from jedi.inference.param import get_executed_param_names_and_issues
executed_param_names, issues = \ executed_param_names, issues = \
arguments.get_executed_param_names_and_issues(self._function_value) get_executed_param_names_and_issues(self._function_value, arguments)
if issues: if issues:
return False return False