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

refactoring in dynamic param searching

Browse Source
This commit is contained in:
Dave Halter
2014-08-04 01:39:05 +02:00
parent 7bba12e8c5
commit 0a0673e87c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jedi/evaluate/dynamic.py
View File

@@ -80,8 +80,8 @@ def search_params(evaluator, param):
# This whole stuff is just to not execute certain parts # This whole stuff is just to not execute certain parts
# (speed improvement), basically we could just call # (speed improvement), basically we could just call
# ``eval_call_path`` on the call_path and it would # ``eval_call_path`` on the call_path and it would also
# also work. # work.
def listRightIndex(lst, value): def listRightIndex(lst, value):
return len(lst) - lst[-1::-1].index(value) - 1 return len(lst) - lst[-1::-1].index(value) - 1
@@ -90,12 +90,12 @@ def search_params(evaluator, param):
call_path_simple = [unicode(d) if isinstance(d, pr.NamePart) call_path_simple = [unicode(d) if isinstance(d, pr.NamePart)
else d for d in call_path] else d for d in call_path]
i = listRightIndex(call_path_simple, func_name) i = listRightIndex(call_path_simple, func_name)
first, last = call_path[:i], call_path[i + 1:] before, after = call_path[:i], call_path[i + 1:]
if not last and not call_path_simple.index(func_name) != i: if not after and not call_path_simple.index(func_name) != i:
continue continue
scopes = [scope] scopes = [scope]
if first: if before:
scopes = evaluator.eval_call_path(iter(first), c.parent, pos) scopes = evaluator.eval_call_path(iter(before), c.parent, pos)
pos = None pos = None
from jedi.evaluate import representation as er from jedi.evaluate import representation as er
for scope in scopes: for scope in scopes:
@@ -105,7 +105,7 @@ def search_params(evaluator, param):
# doesn't matter. But this is a way to get potential # doesn't matter. But this is a way to get potential
# candidates for calling that function really quick! # candidates for calling that function really quick!
s = evaluator.find_types(scope, func_name, position=pos, s = evaluator.find_types(scope, func_name, position=pos,
search_global=not first, search_global=not before,
resolve_decorator=False) resolve_decorator=False)
c = [getattr(escope, 'base_func', None) or escope.base c = [getattr(escope, 'base_func', None) or escope.base
@@ -114,7 +114,7 @@ def search_params(evaluator, param):
if compare in c: if compare in c:
# only if we have the correct function we execute # only if we have the correct function we execute
# it, otherwise just ignore it. # it, otherwise just ignore it.
evaluator.follow_path(iter(last), s, scope) evaluator.follow_path(iter(after), s, scope)
return listener.param_possibilities return listener.param_possibilities
result = [] result = []