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

search_call_signature refactoring

Browse Source
This commit is contained in:
Dave Halter
2014-04-19 16:26:15 +02:00
parent bb6874bc7c
commit 1f7fd6f439
3 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/api/__init__.py
View File

@@ -33,6 +33,7 @@ from jedi.evaluate import compiled
from jedi.evaluate import imports
from jedi.evaluate.helpers import FakeName
from jedi.evaluate.finder import get_names_of_scope
from jedi.evaluate.helpers import search_call_signatures
class NotFoundError(Exception):
@@ -370,7 +371,7 @@ class Script(object):
else:
# Fetch definition of callee, if there's no path otherwise.
if not goto_path:
(call, _) = helpers.func_call_and_param_index(user_stmt, self._pos)
(call, _) = search_call_signatures(user_stmt, self._pos)
if call is not None:
while call.next is not None:
call = call.next
@@ -548,7 +549,7 @@ class Script(object):
:rtype: list of :class:`classes.CallSignature`
"""
user_stmt = self._parser.user_stmt_with_whitespace()
call, index = helpers.func_call_and_param_index(user_stmt, self._pos)
call, index = search_call_signatures(user_stmt, self._pos)
if call is None:
return []

10
jedi/api/helpers.py
View File

@@ -9,16 +9,6 @@ from jedi.evaluate import imports
from jedi.parser import representation as pr
def func_call_and_param_index(user_stmt, position):
debug.speed('func_call start')
call, index = None, 0
if call is None:
if user_stmt is not None and isinstance(user_stmt, pr.Statement):
call, index, _ = helpers.search_call_signatures(user_stmt, position)
debug.speed('func_call parsed')
return call, index
def completion_parts(path_until_cursor):
"""
Returns the parts for the completion