VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-07 22:44:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor dynamic params a bit

Browse Source
This commit is contained in:
Dave Halter
2019-09-04 09:31:01 +02:00
parent 96848dd627
commit 46e9b9e7cf
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jedi/inference/dynamic_params.py
View File

@@ -167,12 +167,12 @@ def _get_potential_nodes(module_value, func_string_name):
def _check_name_for_execution(inference_state, context, compare_node, name, trailer): def _check_name_for_execution(inference_state, context, compare_node, name, trailer):
from jedi.inference.value.function import BaseFunctionExecutionContext from jedi.inference.value.function import BaseFunctionExecutionContext
def create_func_excs(value): def create_args(value):
arglist = trailer.children[1] arglist = trailer.children[1]
if arglist == ')': if arglist == ')':
arglist = None arglist = None
args = TreeArguments(inference_state, context, arglist, trailer) args = TreeArguments(inference_state, context, arglist, trailer)
from jedi.inference.value.instance import BoundMethod, InstanceArguments from jedi.inference.value.instance import InstanceArguments
if value.tree_node.type == 'classdef': if value.tree_node.type == 'classdef':
created_instance = instance.TreeInstance( created_instance = instance.TreeInstance(
inference_state, inference_state,
@@ -180,18 +180,16 @@ def _check_name_for_execution(inference_state, context, compare_node, name, trai
value, value,
args args
) )
args = InstanceArguments(created_instance, args) return InstanceArguments(created_instance, args)
yield args
else: else:
if isinstance(value, BoundMethod): if value.is_bound_method():
args = InstanceArguments(value.instance, args) args = InstanceArguments(value.instance, args)
yield args return args
for value in inference_state.goto_definitions(context, name): for value in inference_state.goto_definitions(context, name):
value_node = value.tree_node value_node = value.tree_node
if compare_node == value_node: if compare_node == value_node:
for arguments in create_func_excs(value): yield create_args(value)
yield arguments
elif isinstance(value.parent_context, BaseFunctionExecutionContext) \ elif isinstance(value.parent_context, BaseFunctionExecutionContext) \
and compare_node.type == 'funcdef': and compare_node.type == 'funcdef':
# Here we're trying to find decorators by checking the first # Here we're trying to find decorators by checking the first
@@ -201,11 +199,10 @@ def _check_name_for_execution(inference_state, context, compare_node, name, trai
if len(param_names) != 1: if len(param_names) != 1:
continue continue
values = param_names[0].infer() values = param_names[0].infer()
nodes = [v.tree_node for v in values] if [v.tree_node for v in values] == [compare_node]:
if nodes == [compare_node]:
# Found a decorator. # Found a decorator.
module_context = context.get_root_context() module_context = context.get_root_context()
execution_context = value.as_context(next(create_func_excs(value))) execution_context = value.as_context(create_args(value))
potential_nodes = _get_potential_nodes(module_context, param_names[0].string_name) potential_nodes = _get_potential_nodes(module_context, param_names[0].string_name)
for name, trailer in potential_nodes: for name, trailer in potential_nodes:
if value_node.start_pos < name.start_pos < value_node.end_pos: if value_node.start_pos < name.start_pos < value_node.end_pos: